diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/usb/host/ohci-omap.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 3d532b709670..1eb64d08b60a 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
| @@ -470,7 +470,6 @@ static const struct hc_driver ohci_omap_hc_driver = { | |||
| 470 | */ | 470 | */ |
| 471 | .hub_status_data = ohci_hub_status_data, | 471 | .hub_status_data = ohci_hub_status_data, |
| 472 | .hub_control = ohci_hub_control, | 472 | .hub_control = ohci_hub_control, |
| 473 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 474 | #ifdef CONFIG_PM | 473 | #ifdef CONFIG_PM |
| 475 | .bus_suspend = ohci_bus_suspend, | 474 | .bus_suspend = ohci_bus_suspend, |
| 476 | .bus_resume = ohci_bus_resume, | 475 | .bus_resume = ohci_bus_resume, |