diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
| commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
| tree | c6015f399aac7f0566dfadb984d843fe67175329 /drivers/usb/host/ohci-sa1111.c | |
| parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
| parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/ohci-sa1111.c')
| -rw-r--r-- | drivers/usb/host/ohci-sa1111.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 814d2be4ee7..fb3221ebbb2 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c @@ -235,10 +235,11 @@ static const struct hc_driver ohci_sa1111_hc_driver = { */ .hub_status_data = ohci_hub_status_data, .hub_control = ohci_hub_control, -#ifdef CONFIG_USB_SUSPEND - .hub_suspend = ohci_hub_suspend, - .hub_resume = ohci_hub_resume, +#ifdef CONFIG_PM + .bus_suspend = ohci_bus_suspend, + .bus_resume = ohci_bus_resume, #endif + .start_port_reset = ohci_start_port_reset, }; /*-------------------------------------------------------------------------*/ |