[ARM] 4807/2: ixp4xx: Merge nslu2-power.c into nslu2-setup.c
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Feb 2008 11:05:42 +0000 (12:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Feb 2008 13:15:26 +0000 (13:15 +0000)
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, removing
superfluous header includes and removing superfluous constants from
the machine header file.

--

Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

No differences found