diff options
author | David Brownell <david-b@pacbell.net> | 2007-10-10 01:04:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:55:33 -0400 |
commit | b24896c6b7ddb37ab20ba0bbfd0ed36a38923f67 (patch) | |
tree | e8b758635e84e5f9157f0504bb31207f4aae45a8 | |
parent | 4f45426cfd6170311e116442ccd8ce0e31979237 (diff) |
USB: ehci build fixes on au1xxx, ppc-soc
Cleanup: references to two PM routines (and HCD entry points)
that no longer exist are swapped with their replacements.
Evidently au1xxx and ppc-soc EHCI support doesn't get compiled
with power management very much, or these build bugs would have
been patched long ago.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/host/ehci-au1xxx.c | 6 | ||||
-rw-r--r-- | drivers/usb/host/ehci-ppc-soc.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index b1d19268cb23..766ef68a0b43 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
@@ -220,10 +220,8 @@ static const struct hc_driver ehci_au1xxx_hc_driver = { | |||
220 | */ | 220 | */ |
221 | .hub_status_data = ehci_hub_status_data, | 221 | .hub_status_data = ehci_hub_status_data, |
222 | .hub_control = ehci_hub_control, | 222 | .hub_control = ehci_hub_control, |
223 | #ifdef CONFIG_PM | 223 | .bus_suspend = ehci_bus_suspend, |
224 | .hub_suspend = ehci_hub_suspend, | 224 | .bus_resume = ehci_bus_resume, |
225 | .hub_resume = ehci_hub_resume, | ||
226 | #endif | ||
227 | }; | 225 | }; |
228 | 226 | ||
229 | /*-------------------------------------------------------------------------*/ | 227 | /*-------------------------------------------------------------------------*/ |
diff --git a/drivers/usb/host/ehci-ppc-soc.c b/drivers/usb/host/ehci-ppc-soc.c index 4f99b0eb27bc..452d4b1bc859 100644 --- a/drivers/usb/host/ehci-ppc-soc.c +++ b/drivers/usb/host/ehci-ppc-soc.c | |||
@@ -160,10 +160,8 @@ static const struct hc_driver ehci_ppc_soc_hc_driver = { | |||
160 | */ | 160 | */ |
161 | .hub_status_data = ehci_hub_status_data, | 161 | .hub_status_data = ehci_hub_status_data, |
162 | .hub_control = ehci_hub_control, | 162 | .hub_control = ehci_hub_control, |
163 | #ifdef CONFIG_PM | 163 | .bus_suspend = ehci_bus_suspend, |
164 | .hub_suspend = ehci_hub_suspend, | 164 | .bus_resume = ehci_bus_resume, |
165 | .hub_resume = ehci_hub_resume, | ||
166 | #endif | ||
167 | }; | 165 | }; |
168 | 166 | ||
169 | static int ehci_hcd_ppc_soc_drv_probe(struct platform_device *pdev) | 167 | static int ehci_hcd_ppc_soc_drv_probe(struct platform_device *pdev) |