From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Feb 2008 11:05:42 +0000 (+0100)
Subject: [ARM] 4807/2: ixp4xx: Merge nslu2-power.c into nslu2-setup.c
X-Git-Tag: v2.6.25-rc1~1055^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0929ac3ea4c0bece16b0c5c5365181fa45fbf582;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed