]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7dc059b) | patch
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)
commitffb8692f95daa140d1767dac2de090cc6aad5ba5
tree0ae303523768d933218ada96ecceb57c3d1fd74btree | snapshot
parent7dc059befba415fc37a64d71cf2ead5950876043commit | diff
ARM: LPC32xx: clock.c: Fix lpc-eth clock reference

During a complex merge for v3.4, one line of the commit
368aee4bc14fe0000887bb5fe8c38c531d243d03 ("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 diff | blob | history
Linux Kernel Source Tree.