Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 714daf73 authored by Roland Stigge's avatar Roland Stigge Committed by Olof Johansson
Browse files

ARM: LPC32xx: clock.c: Fix lpc-eth clock reference 



During a complex merge for v3.4, one line of the commit
c20b909b ("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: default avatarRoland Stigge <stigge@antcom.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent b5174fa3

arch/arm/mach-lpc32xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -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)