diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-05 16:01:20 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-05 16:01:20 +1000 |
| commit | 81210c2062cf98bf625bcd487334c89b0fce5a82 (patch) | |
| tree | e4bbfca5cc5b9416f6d96ee0f389d0a1033e63be /arch | |
| parent | 883a805d617baca1c01172dc1d35e37829ffed0c (diff) | |
| download | linux-stable-81210c2062cf98bf625bcd487334c89b0fce5a82.tar.gz linux-stable-81210c2062cf98bf625bcd487334c89b0fce5a82.tar.bz2 linux-stable-81210c2062cf98bf625bcd487334c89b0fce5a82.zip | |
powerpc: Fix build without CONFIG_PCI
Commit fea80311a939a746533a6d7e7c3183729d6a3faf
"iomap: make IOPORT/PCI mapping functions conditional"
Broke powerpc build without CONFIG_PCI as we would still define
pci_iomap(), which overlaps with the new empty inline in the headers.
Make our implementation conditional on CONFIG_PCI
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/iomap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c index 1577434f4088..faca64accac1 100644 --- a/arch/powerpc/kernel/iomap.c +++ b/arch/powerpc/kernel/iomap.c @@ -117,6 +117,7 @@ void ioport_unmap(void __iomem *addr) EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); +#ifdef CONFIG_PCI void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) { resource_size_t start = pci_resource_start(dev, bar); @@ -143,6 +144,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr) return; iounmap(addr); } +#endif /* CONFIG_PCI */ EXPORT_SYMBOL(pci_iomap); EXPORT_SYMBOL(pci_iounmap); |