diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
commit | 8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7 (patch) | |
tree | 95f30814fc759c2cb523dbea95bc531c7f8f3231 /drivers/usb/host/ehci-orion.c | |
parent | 8c2238eaaf0f774ca0f8d9daad7a616429bbb7f1 (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 3adfda813a7b..ab625f0ba1d9 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -139,10 +139,6 @@ static const struct hc_driver ehci_orion_hc_driver = { | |||
139 | */ | 139 | */ |
140 | .reset = ehci_orion_setup, | 140 | .reset = ehci_orion_setup, |
141 | .start = ehci_run, | 141 | .start = ehci_run, |
142 | #ifdef CONFIG_PM | ||
143 | .suspend = ehci_bus_suspend, | ||
144 | .resume = ehci_bus_resume, | ||
145 | #endif | ||
146 | .stop = ehci_stop, | 142 | .stop = ehci_stop, |
147 | .shutdown = ehci_shutdown, | 143 | .shutdown = ehci_shutdown, |
148 | 144 | ||
@@ -165,6 +161,8 @@ static const struct hc_driver ehci_orion_hc_driver = { | |||
165 | .hub_control = ehci_hub_control, | 161 | .hub_control = ehci_hub_control, |
166 | .bus_suspend = ehci_bus_suspend, | 162 | .bus_suspend = ehci_bus_suspend, |
167 | .bus_resume = ehci_bus_resume, | 163 | .bus_resume = ehci_bus_resume, |
164 | .relinquish_port = ehci_relinquish_port, | ||
165 | .port_handed_over = ehci_port_handed_over, | ||
168 | }; | 166 | }; |
169 | 167 | ||
170 | static void __init | 168 | static void __init |
@@ -250,7 +248,7 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) | |||
250 | ehci->regs = hcd->regs + 0x100 + | 248 | ehci->regs = hcd->regs + 0x100 + |
251 | HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); | 249 | HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); |
252 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | 250 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); |
253 | ehci->is_tdi_rh_tt = 1; | 251 | hcd->has_tt = 1; |
254 | ehci->sbrn = 0x20; | 252 | ehci->sbrn = 0x20; |
255 | 253 | ||
256 | /* | 254 | /* |