From: Roland Stigge Date: Wed, 28 Mar 2012 22:49:56 +0000 (+0200) Subject: ARM: LPC32xx: clock.c: Fix lpc-eth clock reference X-Git-Tag: v3.4-rc1~30^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=714daf73d0889c62e90abf4510e4fab65b4668e8;p=pandora-kernel.git ARM: LPC32xx: clock.c: Fix lpc-eth clock reference During a complex merge for v3.4, one line of the commit c20b909be9ba27173294a52d08cab293ec030a2c ("ARM: LPC32xx: Ethernet support") was reverted wrongly ("lpc-eth.0" -> "lpc-net.0") while the other conflicts were merged correctly. This patch re-applies the clock name "lpc-eth.0". Signed-off-by: Roland Stigge Signed-off-by: Olof Johansson --- Reading git-diff-tree failed