tree ec6925c641f56dd3e20209c20e17f6950ec3c7c4
parent c7d1623e5820c46a39519e64fafb94f39419be82
author Rod Whitby <rod@whitby.id.au> 1202036755 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1202130927 +0000

[ARM] 4809/2: ixp4xx: Merge dsmg600-power.c into dsmg600-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>