diff options
| author | Shannon Zhao <shannon.zhao@linaro.org> | 2015-07-07 17:25:48 +0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-07 09:01:19 -0700 |
| commit | a32844ca3a02130d9c0166b65f54696dfaafc922 (patch) | |
| tree | 6a34ec6ceeadc6d7acd64befd90e4eb9a2db8774 /arch/arm/mach-dove/board-dt.c | |
| parent | c1c767d29bb2390308a35b69957b874e9446fe3b (diff) | |
| parent | a0768244828d0da096ce957616150220da607be1 (diff) | |
Merge tag 'v3.14.47' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14linux-linaro-lsk-v3.14-test
Conflicts:
arch/arm/include/asm/kvm_mmu.h
arch/arm/kvm/mmu.c
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_mmu.h
virt/kvm/arm/vgic.c
Diffstat (limited to 'arch/arm/mach-dove/board-dt.c')
| -rw-r--r-- | arch/arm/mach-dove/board-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index 49fa9abd09da..7a7a09a5d5ff 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -26,7 +26,7 @@ static void __init dove_dt_init(void) #ifdef CONFIG_CACHE_TAUROS2 tauros2_init(0); #endif - BUG_ON(mvebu_mbus_dt_init()); + BUG_ON(mvebu_mbus_dt_init(false)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } |