ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
authorRoland Stigge <stigge@antcom.de>
Wed, 28 Mar 2012 22:49:56 +0000 (00:49 +0200)
committerOlof Johansson <olof@lixom.net>
Thu, 29 Mar 2012 17:58:14 +0000 (10:58 -0700)
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 <stigge@antcom.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-lpc32xx/clock.c

index b7ef511..2fc24ca 100644 (file)
@@ -1134,7 +1134,7 @@ static struct clk_lookup lookups[] = {
        _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1)
        _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)
        _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc)
-       _REGISTER_CLOCK("lpc-net.0", NULL, clk_net)
+       _REGISTER_CLOCK("lpc-eth.0", NULL, clk_net)
        _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)
        _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)
        _REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc)