[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110718095557.cd70fa01.rdunlap@xenotime.net>
Date: Mon, 18 Jul 2011 09:55:57 -0700
From: Randy Dunlap <rdunlap@...otime.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
netdev <netdev@...r.kernel.org>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
davem@...emloft.net, Jonas Bonn <jonas@...thpole.se>,
Arnd Bergmann <arnd@...db.de>
Subject: [PATCH -next] asm-generic/iomap.h: add stubs for pci iomap/iounmap
From: Randy Dunlap <rdunlap@...otime.net>
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
<asm-generic/iomap.h> 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 <rdunlap@...otime.net>
Cc: Jonas Bonn <jonas@...thpole.se>
Cc: Arnd Bergmann <arnd@...db.de>
---
include/asm-generic/iomap.h | 8 ++++++++
1 file changed, 8 insertions(+)
--- linux-next-20110718.orig/include/asm-generic/iomap.h
+++ linux-next-20110718/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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists