diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 10:28:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 10:28:57 -0400 |
| commit | a9e4820c4c170b3df0d2185f7b4130b0b2daed2c (patch) | |
| tree | 962bc52ba0e8e585d88e1fb9a9be9a67072767dd /drivers/usb/host/ehci-hcd.c | |
| parent | c0698f2f6e4839ce9463ce731c892993215ea067 (diff) | |
| parent | e838a0d4d5260bce452c96914a6e86b217c53c55 (diff) | |
Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Yah, it does work to merge. Knock wood.
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index a63bb792e2c7..84d2b93aca37 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -721,7 +721,7 @@ static int ehci_get_frame (struct usb_hcd *hcd) | |||
| 721 | * the right sort of wakeup. | 721 | * the right sort of wakeup. |
| 722 | */ | 722 | */ |
| 723 | 723 | ||
| 724 | static int ehci_suspend (struct usb_hcd *hcd, u32 state) | 724 | static int ehci_suspend (struct usb_hcd *hcd, pm_message_t message) |
| 725 | { | 725 | { |
| 726 | struct ehci_hcd *ehci = hcd_to_ehci (hcd); | 726 | struct ehci_hcd *ehci = hcd_to_ehci (hcd); |
| 727 | 727 | ||
| @@ -729,7 +729,7 @@ static int ehci_suspend (struct usb_hcd *hcd, u32 state) | |||
| 729 | msleep (100); | 729 | msleep (100); |
| 730 | 730 | ||
| 731 | #ifdef CONFIG_USB_SUSPEND | 731 | #ifdef CONFIG_USB_SUSPEND |
| 732 | (void) usb_suspend_device (hcd->self.root_hub, state); | 732 | (void) usb_suspend_device (hcd->self.root_hub, message); |
| 733 | #else | 733 | #else |
| 734 | usb_lock_device (hcd->self.root_hub); | 734 | usb_lock_device (hcd->self.root_hub); |
| 735 | (void) ehci_hub_suspend (hcd); | 735 | (void) ehci_hub_suspend (hcd); |