diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ohci-hub.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/ohci.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index d54183f1d701..439beb784f3e 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
@@ -579,8 +579,6 @@ static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port) | |||
579 | return 0; | 579 | return 0; |
580 | } | 580 | } |
581 | 581 | ||
582 | static void start_hnp(struct ohci_hcd *ohci); | ||
583 | |||
584 | #else | 582 | #else |
585 | 583 | ||
586 | #define ohci_start_port_reset NULL | 584 | #define ohci_start_port_reset NULL |
@@ -767,7 +765,7 @@ static int ohci_hub_control ( | |||
767 | #ifdef CONFIG_USB_OTG | 765 | #ifdef CONFIG_USB_OTG |
768 | if (hcd->self.otg_port == (wIndex + 1) | 766 | if (hcd->self.otg_port == (wIndex + 1) |
769 | && hcd->self.b_hnp_enable) | 767 | && hcd->self.b_hnp_enable) |
770 | start_hnp(ohci); | 768 | ohci->start_hnp(ohci); |
771 | else | 769 | else |
772 | #endif | 770 | #endif |
773 | ohci_writel (ohci, RH_PS_PSS, | 771 | ohci_writel (ohci, RH_PS_PSS, |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 5b2f17838cab..3d532b709670 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) | |||
225 | dev_err(hcd->self.controller, "can't find transceiver\n"); | 225 | dev_err(hcd->self.controller, "can't find transceiver\n"); |
226 | return -ENODEV; | 226 | return -ENODEV; |
227 | } | 227 | } |
228 | ohci->start_hnp = start_hnp; | ||
228 | } | 229 | } |
229 | #endif | 230 | #endif |
230 | 231 | ||
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 73b4a44c2726..df5a8037dbaf 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h | |||
@@ -371,6 +371,7 @@ struct ohci_hcd { | |||
371 | * other external transceivers should be software-transparent | 371 | * other external transceivers should be software-transparent |
372 | */ | 372 | */ |
373 | struct otg_transceiver *transceiver; | 373 | struct otg_transceiver *transceiver; |
374 | void (*start_hnp)(struct ohci_hcd *ohci); | ||
374 | 375 | ||
375 | /* | 376 | /* |
376 | * memory management for queue data structures | 377 | * memory management for queue data structures |