]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0929ac3) | patch
[ARM] 4808/2: ixp4xx: Merge nas100d-power.c into nas100d-setup.c
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Feb 2008 11:05:49 +0000 (12:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Feb 2008 13:15:27 +0000 (13:15 +0000)
commitc7d1623e5820c46a39519e64fafb94f39419be82
treeb7374d7e14b6277f06df911ceaa0554545c0c8b7tree | snapshot
parent0929ac3ea4c0bece16b0c5c5365181fa45fbf582commit | diff
[ARM] 4808/2: ixp4xx: Merge nas100d-power.c into nas100d-setup.c

There is no reason to have power control in a separate file from the
board setup code.  Merge it back into the board setup file and remove
superfluous header includes.

--

Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ixp4xx/Makefile diff | blob | history
arch/arm/mach-ixp4xx/nas100d-power.c [deleted file] blob | history
arch/arm/mach-ixp4xx/nas100d-setup.c diff | blob | history
Linux 2.6 source tree