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: NRod Whitby <rod@whitby.id.au>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>