This reverts commit 53491e04, which hit
the kernel tree too early.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>