From: Randy Dunlap <rdunlap@xenotime•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>, netdev <netdev@vger•kernel.org>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
davem@davemloft•net, Jonas Bonn <jonas@southpole•se>,
Arnd Bergmann <arnd@arndb•de>
Subject: [PATCH -next] asm-generic/iomap.h: add stubs for pci iomap/iounmap
Date: Mon, 18 Jul 2011 09:55:57 -0700 [thread overview]
Message-ID: <20110718095557.cd70fa01.rdunlap@xenotime.net> (raw)
In-Reply-To: <20110718203501.232bd176e83ff65f056366e6@canb.auug.org.au>
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
prev parent reply other threads:[~2011-07-18 16:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 10:35 linux-next: Tree for July 18 Stephen Rothwell
2011-07-18 15:18 ` linux-next: Tree for July 18 (mm/truncate.c) Randy Dunlap
2011-07-18 15:21 ` Christoph Hellwig
2011-07-21 20:50 ` Al Viro
2011-07-21 20:55 ` [PATCH -next] mm/truncate.c: fix build for CONFIG_BLOCK not enabled Randy Dunlap
2011-07-22 15:06 ` Christoph Hellwig
2011-07-18 16:55 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110718095557.cd70fa01.rdunlap@xenotime.net \
--to=rdunlap@xenotime$(echo .)net \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=jonas@southpole$(echo .)se \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox