netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] asm-generic/iomap.h: add stubs for pci iomap/iounmap
       [not found] <20110718203501.232bd176e83ff65f056366e6@canb.auug.org.au>
@ 2011-07-18 16:55 ` Randy Dunlap
  0 siblings, 0 replies; only message in thread
From: Randy Dunlap @ 2011-07-18 16:55 UTC (permalink / raw)
  To: Stephen Rothwell, netdev
  Cc: linux-next, LKML, davem, Jonas Bonn, Arnd Bergmann

From: Randy Dunlap <rdunlap@xenotime.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@xenotime.net>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Arnd Bergmann <arnd@arndb.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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-07-18 16:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20110718203501.232bd176e83ff65f056366e6@canb.auug.org.au>
2011-07-18 16:55 ` [PATCH -next] asm-generic/iomap.h: add stubs for pci iomap/iounmap Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).