Merge branch 'master' into gfs2

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index ce3de106cadc..71371de32ada 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -212,10 +212,6 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
          * basic lifecycle operations
          */
         .start =                ohci_sa1111_start,
-#ifdef  CONFIG_PM
-        /* suspend:             ohci_sa1111_suspend,  -- tbd */
-        /* resume:              ohci_sa1111_resume,   -- tbd */
-#endif
         .stop =                 ohci_stop,
 
         /*
@@ -235,6 +231,7 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
+        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,