p54usb: fix conflict with recent usb changes