2389b272 contains a merge bug; fix it.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>