[PATCH V2] lib: devres: Fix misplaced #endif

From: Jingoo Han
Date: Sun Feb 24 2013 - 21:20:49 EST

A misplaced #endif causes link errors related to pcim_*() functions.

This is because pcim_*() functions are related to CONFIG_PCI
option, however these are not related to CONFIG_HAS_IOPORT option.
Therefore, when CONFIG_PCI is enabled and CONFIG_HAS_IOPORT is not
enabled, it makes link errors related to pcim_*() functions
as below:

drivers/ata/libata-sff.c:3233: undefined reference to `pcim_iomap_regions'
drivers/ata/libata-sff.c:3238: undefined reference to `pcim_iomap_table'
drivers/built-in.o: In function `ata_pci_sff_init_host':
drivers/ata/libata-sff.c:2318: undefined reference to `pcim_iomap_regions'
drivers/ata/libata-sff.c:2329: undefined reference to `pcim_iomap_table

Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
Changes since v1:
- Added more detailed commit message

lib/devres.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/devres.c b/lib/devres.c
index 88ad759..8235331 100644
--- 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));
+#endif /* CONFIG_HAS_IOPORT */

@@ -432,4 +433,3 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
#endif /* CONFIG_PCI */
-#endif /* CONFIG_HAS_IOPORT */

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/