The patch titled Subject: lib/devres.c: fix misplaced #endif has been added to the -mm tree. Its filename is lib-devresc-fix-misplaced-endif.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: 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@xxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/devres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN lib/devres.c~lib-devresc-fix-misplaced-endif lib/devres.c --- a/lib/devres.c~lib-devresc-fix-misplaced-endif +++ a/lib/devres.c @@ -227,6 +227,7 @@ void devm_ioport_unmap(struct device *de 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 } EXPORT_SYMBOL(pcim_iounmap_regions); #endif /* CONFIG_PCI */ -#endif /* CONFIG_HAS_IOPORT */ _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are origin.patch linux-next.patch backlight-ams369fg06-make-power_on-call-optional.patch lib-devresc-fix-misplaced-endif.patch drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops.patch backlight-platform_lcd-remove-unnecessary-ifdefs.patch rtc-rtc-v3020-use-gpio_request_array.patch rtc-add-devm_rtc_device_registerunregister.patch rtc-rtc-palmas-use-devm_request_threaded_irq.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html