Skip to content

Commit

Permalink
powerpc: Fix build without CONFIG_PCI
Browse files Browse the repository at this point in the history
Commit fea8031
"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 <[email protected]>
  • Loading branch information
ozbenh committed Aug 5, 2011
1 parent 883a805 commit 81210c2
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/iomap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

0 comments on commit 81210c2

Please sign in to comment.