]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit06df93610453524e4e97613c40eb53a37c6c8bd6
treee5ee8bd64aaf3bb3342426e842504d659bb976c0
parent55a55171fe74c9cb1640a2413f43f73aeb37210a
Fix ARM merge mistake in mvebu board file

Russell King points out that my ARM merge (commit 9a91ce8ea03e) 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