Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <rmk@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

-1
-1
arch/arm/mach-mvebu/board-v7.c
··· 78 78 mvebu_scu_enable(); 79 79 coherency_init(); 80 80 BUG_ON(mvebu_mbus_dt_init(coherency_available())); 81 - l2x0_of_init(0, ~0UL); 82 81 83 82 if (of_machine_is_compatible("marvell,armada375")) 84 83 hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,