From: Thomas Petazzoni Date: Tue, 20 May 2014 15:13:03 +0000 (+0200) Subject: ARM: mvebu: coherency: fix registration of PCI bus notifier when !PCI X-Git-Tag: v3.16-rc1~43^2~7^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8828ccc3f2a8e32ddf1a0e1a80742e8482f18cea;p=platform%2Fkernel%2Flinux-exynos.git ARM: mvebu: coherency: fix registration of PCI bus notifier when !PCI Commit b0063aad5dd8 ("ARM: mvebu: use hardware I/O coherency also for PCI devices") added a reference to the pci_bus_type variable, but this variable is only available when CONFIG_PCI is enabled. Therefore, there is now a build failure in !CONFIG_PCI situations. This commit fixes that by enclosing the entire initcall into a IS_ENABLED(CONFIG_PCI) condition. Reported-by: Arnd Bergmann Signed-off-by: Thomas Petazzoni Link: https://lkml.kernel.org/r/1400598783-706-1-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper --- diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index a222507..477202f 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -422,6 +422,7 @@ static int __init coherency_late_init(void) postcore_initcall(coherency_late_init); +#if IS_ENABLED(CONFIG_PCI) static int __init coherency_pci_init(void) { if (coherency_available()) @@ -431,3 +432,4 @@ static int __init coherency_pci_init(void) } arch_initcall(coherency_pci_init); +#endif