aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
-rw-r--r--drivers/usb/host/ehci-hcd.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 535a1aa8990..10ed7452b5b 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -43,8 +43,6 @@
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/unaligned.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/langwell_otg.h>
/*-------------------------------------------------------------------------*/
@@ -1159,7 +1157,7 @@ MODULE_LICENSE ("GPL");
#define PCI_DRIVER ehci_pci_driver
#ifdef CONFIG_USB_LANGWELL_OTG
#include "ehci-langwell-pci.c"
-#define LNW_OTG_HOST_DRIVER ehci_otg_driver
+#define INTEL_MID_OTG_HOST_DRIVER ehci_otg_driver
#endif
#endif
@@ -1286,16 +1284,16 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
-#ifdef LNW_OTG_HOST_DRIVER
- retval = langwell_register_host(&LNW_OTG_HOST_DRIVER);
+#ifdef INTEL_MID_OTG_HOST_DRIVER
+ retval = intel_mid_ehci_driver_register(&INTEL_MID_OTG_HOST_DRIVER);
if (retval < 0)
goto clean5;
#endif
return retval;
-#ifdef LNW_OTG_HOST_DRIVER
+#ifdef INTEL_MID_OTG_HOST_DRIVER
clean5:
- langwell_unregister_host(&LNW_OTG_HOST_DRIVER);
+ intel_mid_ehci_driver_unregister(&INTEL_MID_OTG_HOST_DRIVER);
#endif
#ifdef XILINX_OF_PLATFORM_DRIVER
/* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */
@@ -1329,8 +1327,8 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
-#ifdef LNW_OTG_HOST_DRIVER
- langwell_unregister_host(&LNW_OTG_HOST_DRIVER);
+#ifdef INTEL_MID_OTG_HOST_DRIVER
+ intel_mid_ehci_driver_unregister(&INTEL_MID_OTG_HOST_DRIVER);
#endif
#ifdef XILINX_OF_PLATFORM_DRIVER
of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);