diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
| commit | 54ef76f37bcccf8c16fbaaed13c3c40825195958 (patch) | |
| tree | 59afdb95e68f2fbac2550aa42135921086649c38 /drivers/usb/host/ohci-sh.c | |
| parent | 032f82786f9be4635acaa5f77feca175a4ac5fe1 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/usb/host/ohci-sh.c')
| -rw-r--r-- | drivers/usb/host/ohci-sh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 60f03cc7ec4f..e7ee607278fe 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
| @@ -68,6 +68,7 @@ static const struct hc_driver ohci_sh_hc_driver = { | |||
| 68 | */ | 68 | */ |
| 69 | .hub_status_data = ohci_hub_status_data, | 69 | .hub_status_data = ohci_hub_status_data, |
| 70 | .hub_control = ohci_hub_control, | 70 | .hub_control = ohci_hub_control, |
| 71 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 71 | #ifdef CONFIG_PM | 72 | #ifdef CONFIG_PM |
| 72 | .bus_suspend = ohci_bus_suspend, | 73 | .bus_suspend = ohci_bus_suspend, |
| 73 | .bus_resume = ohci_bus_resume, | 74 | .bus_resume = ohci_bus_resume, |