Fix ARM merge mistake in mvebu board file
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 17:24:07 +0000 (10:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 17:24:07 +0000 (10:24 -0700)
commit9e47aaef0bd3a50a43626fa6b19e1f964ac173d6
treee5ee8bd64aaf3bb3342426e842504d659bb976c0
parent2b03adc1911d1c84cb7fad8b424234f589547cb3
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>
arch/arm/mach-mvebu/board-v7.c