]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b7edc84) | patch
[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)
commit0929ac3ea4c0bece16b0c5c5365181fa45fbf582
treeb3cd775d5aba4c536d95d9860f7fe9f80b827ed3tree | snapshot
parentb7edc84a9619eb2c8bfb5265d4079da9c70ad270commit | diff
[ARM] 4807/2: ixp4xx: Merge nslu2-power.c into nslu2-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, 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>
arch/arm/mach-ixp4xx/Makefile diff | blob | history
arch/arm/mach-ixp4xx/nslu2-power.c [deleted file] blob | history
arch/arm/mach-ixp4xx/nslu2-setup.c diff | blob | history
include/asm-arm/arch-ixp4xx/nslu2.h diff | blob | history
Linux 2.6 source tree