Patch from Richard Purdie

Remove a couple of lines of accidently added code causing compile
errors.
Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>