Commit 9ed8a30f authored Feb 27, 2013 by Jingoo Han Committed by Linus Torvalds Feb 27, 2013

lib/devres.c: fix misplaced #endif



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@samsung.com>
Cc: Greg KH <greg@kroah.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a0031197

lib/devres.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -227,6 +227,7 @@ void devm_ioport_unmap(struct device dev, void __iomem addr)
	devm_ioport_map_match, (void *)addr));		devm_ioport_map_match, (void *)addr));
	}		}
	EXPORT_SYMBOL(devm_ioport_unmap);		EXPORT_SYMBOL(devm_ioport_unmap);
			#endif /* CONFIG_HAS_IOPORT */

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

Admin message