This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>