diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /drivers/usb/host/ohci-ssb.c | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/usb/host/ohci-ssb.c')
| -rw-r--r-- | drivers/usb/host/ohci-ssb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index c4265caec780..7275186db315 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
| @@ -81,6 +81,7 @@ static const struct hc_driver ssb_ohci_hc_driver = { | |||
| 81 | 81 | ||
| 82 | .hub_status_data = ohci_hub_status_data, | 82 | .hub_status_data = ohci_hub_status_data, |
| 83 | .hub_control = ohci_hub_control, | 83 | .hub_control = ohci_hub_control, |
| 84 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 84 | #ifdef CONFIG_PM | 85 | #ifdef CONFIG_PM |
| 85 | .bus_suspend = ohci_bus_suspend, | 86 | .bus_suspend = ohci_bus_suspend, |
| 86 | .bus_resume = ohci_bus_resume, | 87 | .bus_resume = ohci_bus_resume, |