diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
| commit | b0477f5f8ec85bf8a82f6aa6eee308d72c418032 (patch) | |
| tree | d520be10a261f418dbf4539f1d2b5d48d74ba0d3 /arch/arm/mach-mvebu/coherency.c | |
| parent | 13a29d9ad242f0bf3b31afe812c81558d54892de (diff) | |
| parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.07-android
Diffstat (limited to 'arch/arm/mach-mvebu/coherency.c')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index 2ffccd4eb084..01efe130912e 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -448,8 +448,9 @@ static int __init coherency_late_init(void) armada_375_coherency_init_wa(); } - bus_register_notifier(&platform_bus_type, - &mvebu_hwcc_nb); + if (coherency_available()) + bus_register_notifier(&platform_bus_type, + &mvebu_hwcc_nb); return 0; } |