Commit 8828ccc3 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

ARM: mvebu: coherency: fix registration of PCI bus notifier when !PCI

Commit b0063aad ("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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400598783-706-1-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 497a9230
...@@ -422,6 +422,7 @@ static int __init coherency_late_init(void) ...@@ -422,6 +422,7 @@ static int __init coherency_late_init(void)
postcore_initcall(coherency_late_init); postcore_initcall(coherency_late_init);
#if IS_ENABLED(CONFIG_PCI)
static int __init coherency_pci_init(void) static int __init coherency_pci_init(void)
{ {
if (coherency_available()) if (coherency_available())
...@@ -431,3 +432,4 @@ static int __init coherency_pci_init(void) ...@@ -431,3 +432,4 @@ static int __init coherency_pci_init(void)
} }
arch_initcall(coherency_pci_init); arch_initcall(coherency_pci_init);
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment