1 --- a/drivers/usb/host/ehci-hcd.c
2 +++ b/drivers/usb/host/ehci-hcd.c
3 @@ -1336,12 +1336,12 @@ MODULE_LICENSE ("GPL");
5 #ifdef CONFIG_USB_EHCI_HCD_PLATFORM
6 #include "ehci-platform.c"
7 -#define PLATFORM_DRIVER ehci_platform_driver
8 +#define EHCI_PLATFORM_DRIVER ehci_platform_driver
11 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
12 !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
13 - !defined(XILINX_OF_PLATFORM_DRIVER)
14 + !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)
15 #error "missing bus glue for ehci-hcd"
18 @@ -1401,8 +1401,19 @@ static int __init ehci_hcd_init(void)
23 +#ifdef EHCI_PLATFORM_DRIVER
24 + retval = platform_driver_register(&EHCI_PLATFORM_DRIVER);
31 +#ifdef EHCI_PLATFORM_DRIVER
32 + platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
35 #ifdef XILINX_OF_PLATFORM_DRIVER
36 /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
38 @@ -1435,6 +1446,9 @@ module_init(ehci_hcd_init);
40 static void __exit ehci_hcd_cleanup(void)
42 +#ifdef EHCI_PLATFORM_DRIVER
43 + platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
45 #ifdef XILINX_OF_PLATFORM_DRIVER
46 platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);