From dedae7945b7df4f6fe57fc059f9d6aa9bf2b0a4f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 6 Oct 2004 03:20:23 -0700 Subject: [PATCH] [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 Signed-off-by: Greg Kroah-Hartman --- include/linux/pci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/pci.h b/include/linux/pci.h index 9bb6c7a96b0e7..7dcb03795de60 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -894,8 +894,8 @@ unsigned int ss_vendor, unsigned int ss_device, struct pci_dev *from) 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; } -- 2.53.0