This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly.  This commit contains the correct
resolution.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>