diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-05-20 17:13:03 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-22 16:17:46 +0200 |
| commit | 8828ccc3f2a8e32ddf1a0e1a80742e8482f18cea (patch) | |
| tree | a92a3ca34461a5c07f6ba009eb3198a72f0d4f8e /arch/arm/mach-mvebu | |
| parent | ARM: mvebu: implement L2/PCIe deadlock workaround (diff) | |
| download | linux-8828ccc3f2a8e32ddf1a0e1a80742e8482f18cea.tar.xz linux-8828ccc3f2a8e32ddf1a0e1a80742e8482f18cea.zip | |
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 <arnd@arndb.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400598783-706-1-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index a2225070ac3d..477202fd39cc 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 |