Fix ARM merge mistake in mvebu board file
Russell King points out that my ARM merge (commit eb3d3ec567
) was
broken wrt the arch/arm/mach-mvebu/board-v7.c file, leaving in a stale
l2x0_of_init() call (it's now handled by the DT description).
Which is kind of embarrassing, since I knew about it as it wasn't the
only file that had similar merge issues. At least I got the other ones
right.
Reported-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2b03adc191
commit
9e47aaef0b
|
@ -78,7 +78,6 @@ static void __init mvebu_timer_and_clk_init(void)
|
||||||
mvebu_scu_enable();
|
mvebu_scu_enable();
|
||||||
coherency_init();
|
coherency_init();
|
||||||
BUG_ON(mvebu_mbus_dt_init(coherency_available()));
|
BUG_ON(mvebu_mbus_dt_init(coherency_available()));
|
||||||
l2x0_of_init(0, ~0UL);
|
|
||||||
|
|
||||||
if (of_machine_is_compatible("marvell,armada375"))
|
if (of_machine_is_compatible("marvell,armada375"))
|
||||||
hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
|
hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
|
||||||
|
|
Loading…
Reference in New Issue