diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/usb/host/uhci-hcd.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
| -rw-r--r-- | drivers/usb/host/uhci-hcd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 944f7e0ca4df..cf5e4cf7ea42 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
| @@ -942,7 +942,6 @@ static struct pci_driver uhci_pci_driver = { | |||
| 942 | 942 | ||
| 943 | #ifdef CONFIG_PM | 943 | #ifdef CONFIG_PM |
| 944 | .suspend = usb_hcd_pci_suspend, | 944 | .suspend = usb_hcd_pci_suspend, |
| 945 | .resume_early = usb_hcd_pci_resume_early, | ||
| 946 | .resume = usb_hcd_pci_resume, | 945 | .resume = usb_hcd_pci_resume, |
| 947 | #endif /* PM */ | 946 | #endif /* PM */ |
| 948 | }; | 947 | }; |