diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-25 13:28:46 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:30 -0800 |
| commit | 2f3e0d74d640524c8f7d889642268d0d9b7ae431 (patch) | |
| tree | 9417945aac95f30fae6a5c381433d445231e5061 /drivers/usb/host/ehci-hub.c | |
| parent | 6a014a1c5cd02aa7592733e661ba034ab692e94a (diff) | |
HACK: Revert "USB: extend ehci-fsl and fsl_udc_core driver for OTG operation"
This reverts commit 83722bc9430424de1614ff31696f73a40b3d81a9.
Our OTG support doesn't play nice with the upstreamed OTG support, so
for now, revert the upstream commit.
Conflicts:
drivers/usb/gadget/fsl_udc_core.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R5a4b466ee983307ee277a591e664c854b0ddd970
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 59ff46ece6eb..25ed607aab9a 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -27,7 +27,6 @@ */ /*-------------------------------------------------------------------------*/ -#include <linux/usb/otg.h> #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) @@ -726,13 +725,6 @@ static int ehci_hub_control ( goto error; if (ehci->no_selective_suspend) break; -#ifdef CONFIG_USB_OTG - if ((hcd->self.otg_port == (wIndex + 1)) - && hcd->self.b_hnp_enable) { - otg_start_hnp(ehci->transceiver); - break; - } -#endif if (!(temp & PORT_SUSPEND)) break; if ((temp & PORT_PE) == 0) |