linux-wandboard

USB: fix up some odd parts due to partial merges

Thanks to Andrew for doing the hard work on this.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>