This reverts commit 8a99b6ad.

Geert doesn't want it going in through the USB tree, ok, whatever...

Cc: Chris Brandt <chris.brandt@renesas.com>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>