From fea80311a939a746533a6d7e7c3183729d6a3faf Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sun, 24 Jul 2011 11:39:14 -0700 Subject: [PATCH] iomap: make IOPORT/PCI mapping functions conditional When CONFIG_PCI is not enabled, CONFIG_EISA=y, and CONFIG_GENERIC_IOMAP=y, drivers/net/3c59x.c build fails due to a recent small change to that surrounds pci_iomap() and pci_iounmap() with #ifdef CONFIG_PCI/#endif. Since that patch to iomap.h looks correct, add stubs for pci_iomap() and pci_iounmap() with CONFIG_PCI is not enabled to fix the build errors. drivers/net/3c59x.c:1026: error: implicit declaration of function 'pci_iomap' drivers/net/3c59x.c:1038: error: implicit declaration of function 'pci_iounmap' Signed-off-by: Randy Dunlap Cc: Jonas Bonn Cc: Arnd Bergmann Signed-off-by: Linus Torvalds --- include/asm-generic/iomap.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h index c74ef2c..98dcd76 100644 --- a/include/asm-generic/iomap.h +++ b/include/asm-generic/iomap.h @@ -71,6 +71,14 @@ extern void ioport_unmap(void __iomem *); struct pci_dev; extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); extern void pci_iounmap(struct pci_dev *dev, void __iomem *); +#else +struct pci_dev; +static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) +{ + return NULL; +} +static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) +{ } #endif #endif -- 2.7.4