Merge branch 'akpm' (patches from Andrew Morton)

[~andy/linux] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index 88ad75952a764fd206ba621c0294a322218504ce..823533138fa04e8f43445323a2118bfb4ac0d646 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -227,6 +227,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
                               devm_ioport_map_match, (void *)addr));
 }
 EXPORT_SYMBOL(devm_ioport_unmap);
+#endif /* CONFIG_HAS_IOPORT */
 
 #ifdef CONFIG_PCI
 /*
@@ -432,4 +433,3 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
 }
 EXPORT_SYMBOL(pcim_iounmap_regions);
 #endif /* CONFIG_PCI */
-#endif /* CONFIG_HAS_IOPORT */