leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
714daf73d0
linux/arch/arm/mach-lpc32xx
History
Roland Stigge 714daf73d0 ARM: LPC32xx: clock.c: Fix lpc-eth clock reference 
During a complex merge for v3.4, one line of the commit
c20b909be9 ("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>
2012-03-29 10:58:14 -07:00
..
include/mach ARM: More SoC driver updates 2012-03-28 12:17:06 -07:00
clock.c ARM: LPC32xx: clock.c: Fix lpc-eth clock reference 2012-03-29 10:58:14 -07:00
clock.h ARM: LPC32XX: Clock driver 2010-07-27 03:08:09 -07:00
common.c ARM: LPC32xx: Ethernet support 2012-03-13 21:23:07 +01:00
common.h ARM: Non-critical bug fixes 2012-03-27 21:24:03 -07:00
irq.c Merge branch 'lpc32xx/drivers' into next/drivers 2012-03-15 14:48:42 +00:00
Kconfig ARM: LPC32xx: Ethernet support 2012-03-13 21:23:07 +01:00
Makefile ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem 2011-08-22 09:13:21 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
phy3250.c ARM: Non-critical bug fixes 2012-03-27 15:55:54 -07:00
pm.c ARM: LPC32xx: Fix missing and bad LPC32XX macros 2012-02-27 17:31:24 +01:00
serial.c ARM: LPC32xx: serial.c: Fixed loop limit 2012-02-27 17:28:03 +01:00
suspend.S ARM: LPC32XX: System suspend support 2010-07-27 08:35:56 -07:00
timer.c ARM: LPC32xx: Fix missing and bad LPC32XX macros 2012-02-27 17:31:24 +01:00