Patch from Uli Luckas

This is a simplification of patch 3116/1 as sugested by Russell King.
Signed-off-by: NUli Luckas <u.luckas@road-gmbh.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>