From a9ed80e5a5dbd295d0ff86b3ae8fd1baa754a4ba Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 5 Aug 2011 16:01:20 +1000 Subject: [PATCH] --- yaml --- r: 262722 b: refs/heads/master c: 81210c2062cf98bf625bcd487334c89b0fce5a82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/iomap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8cd8d404b7c2..957fdc804071 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 883a805d617baca1c01172dc1d35e37829ffed0c +refs/heads/master: 81210c2062cf98bf625bcd487334c89b0fce5a82 diff --git a/trunk/arch/powerpc/kernel/iomap.c b/trunk/arch/powerpc/kernel/iomap.c index 1577434f4088..faca64accac1 100644 --- a/trunk/arch/powerpc/kernel/iomap.c +++ b/trunk/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);