Fix mismerge of drivers/usb/host/ehci.h