fix usb_with_sunxi.patch
cut match-types out of arch_arm.patch