This fixes up the problem Stephen Rothwell reported when trying to merge -next
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Reported-by: NStephen Rothwell <sfr@cab.auug.org.au>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>