Messages in this thread Patch in this message | | | Subject | [PATCH] PCI fixes for 2.6.9 | Date | Tue, 19 Oct 2004 15:42:11 -0700 | From | Greg KH <> |
| |
ChangeSet 1.1997.2.120, 2004/10/06 17:20:23-07:00, akpm@osdl.org
[PATCH] PCI: CONFIG_PCI=n build fix
With CONFIG_PCI=n:
arch/i386/kernel/cpu/cyrix.c: In function `init_cyrix': arch/i386/kernel/cpu/cyrix.c:285: `cyrix_55x0' undeclared (first use in this function) arch/i386/kernel/cpu/cyrix.c:285: (Each undeclared identifier is reported only once arch/i386/kernel/cpu/cyrix.c:285: for each function it appears in.)
Make pci_dev_present() a macro. It doesn't make sense to require that pci_device_id's be in scope when CONFIG_PCI=n
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
include/linux/pci.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/include/linux/pci.h b/include/linux/pci.h --- a/include/linux/pci.h 2004-10-19 15:21:25 -07:00 +++ b/include/linux/pci.h 2004-10-19 15:21:25 -07:00 @@ -894,8 +894,8 @@ static inline struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from) { return NULL; } -static inline int pci_dev_present(const struct pci_device_id *ids) -{ return 0; } + +#define pci_dev_present(ids) (0) static inline void pci_set_master(struct pci_dev *dev) { } static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |