diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
| commit | 373cea9e2c9c6495a80efdae55cf2114f384a75b (patch) | |
| tree | 7a8c31aff389cd60937edf7d311c2d93d42a3c7d /arch/arm/mach-dove/board-dt.c | |
| parent | ea64087da6e7655f5acac074a70496b50b310a29 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.08-rt
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); } |