diff options
| author | Roland Stigge <stigge@antcom.de> | 2012-03-28 18:49:56 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-29 13:58:14 -0400 |
| commit | 714daf73d0889c62e90abf4510e4fab65b4668e8 (patch) | |
| tree | 0ae303523768d933218ada96ecceb57c3d1fd74b /arch/arm/mach-lpc32xx | |
| parent | b5174fa3a7f4f8f150bfa3b917c92608953dfa0f (diff) | |
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 <stigge@antcom.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
| -rw-r--r-- | arch/arm/mach-lpc32xx/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c index b7ef51119d37..2fc24ca12054 100644 --- a/arch/arm/mach-lpc32xx/clock.c +++ b/arch/arm/mach-lpc32xx/clock.c | |||
| @@ -1134,7 +1134,7 @@ static struct clk_lookup lookups[] = { | |||
| 1134 | _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1) | 1134 | _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1) |
| 1135 | _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) | 1135 | _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) |
| 1136 | _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc) | 1136 | _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc) |
| 1137 | _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) | 1137 | _REGISTER_CLOCK("lpc-eth.0", NULL, clk_net) |
| 1138 | _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) | 1138 | _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) |
| 1139 | _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd) | 1139 | _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd) |
| 1140 | _REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc) | 1140 | _REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc) |