diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 13:24:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 13:24:07 -0400 |
| commit | 9e47aaef0bd3a50a43626fa6b19e1f964ac173d6 (patch) | |
| tree | e5ee8bd64aaf3bb3342426e842504d659bb976c0 | |
| parent | 2b03adc1911d1c84cb7fad8b424234f589547cb3 (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-mvebu/board-v7.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) | |||
| 78 | mvebu_scu_enable(); | 78 | mvebu_scu_enable(); |
| 79 | coherency_init(); | 79 | coherency_init(); |
| 80 | BUG_ON(mvebu_mbus_dt_init(coherency_available())); | 80 | BUG_ON(mvebu_mbus_dt_init(coherency_available())); |
| 81 | l2x0_of_init(0, ~0UL); | ||
| 82 | 81 | ||
| 83 | if (of_machine_is_compatible("marvell,armada375")) | 82 | if (of_machine_is_compatible("marvell,armada375")) |
| 84 | hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0, | 83 | hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0, |