diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /drivers/usb/host/ohci-pci.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb/host/ohci-pci.c')
| -rw-r--r-- | drivers/usb/host/ohci-pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 5d625c3fd423..f9961b4c0da3 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -487,7 +487,6 @@ static struct pci_driver ohci_pci_driver = { | |||
| 487 | 487 | ||
| 488 | #ifdef CONFIG_PM | 488 | #ifdef CONFIG_PM |
| 489 | .suspend = usb_hcd_pci_suspend, | 489 | .suspend = usb_hcd_pci_suspend, |
| 490 | .resume_early = usb_hcd_pci_resume_early, | ||
| 491 | .resume = usb_hcd_pci_resume, | 490 | .resume = usb_hcd_pci_resume, |
| 492 | #endif | 491 | #endif |
| 493 | 492 | ||