From: Linus Torvalds Date: Fri, 6 Jun 2014 17:24:07 +0000 (-0700) Subject: Fix ARM merge mistake in mvebu board file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e47aaef0bd3a50a43626fa6b19e1f964ac173d6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Fix ARM merge mistake in mvebu board file Russell King points out that my ARM merge (commit eb3d3ec567e8) 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 Signed-off-by: Linus Torvalds --- diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index 594262b27f56..8bb742fdf5ca 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -78,7 +78,6 @@ static void __init mvebu_timer_and_clk_init(void) mvebu_scu_enable(); coherency_init(); BUG_ON(mvebu_mbus_dt_init(coherency_available())); - l2x0_of_init(0, ~0UL); if (of_machine_is_compatible("marvell,armada375")) hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,