USB: fix up some odd parts due to partial merges
Thanks to Andrew for doing the hard work on this.
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
commit 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1
tree eb7b222d73540590d25ea539cd691dd281753102
parent 50260b69bbec383058875de26dbde28b1a6f8d00
author Greg Kroah-Hartman <[EMAIL PROTECTED]> Fri, 28 Oct 2005 19:59:31 -0700
committer Greg Kroah-Hartman <[EMAIL PROTECTED]> Fri, 28 Oct 2005 19:59:31 -0700
drivers/usb/core/hub.c | 2 +-
drivers/usb/host/ehci-pci.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9660a89..256d9f6 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1674,7 +1674,7 @@ int usb_suspend_device(struct usb_device
return 0;
#endif
}
-
+EXPORT_SYMBOL_GPL(usb_suspend_device);
/*
* If the USB "suspend" state is in use (rather than "global suspend"),
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7872469..1450088 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -252,7 +252,7 @@ static int ehci_pci_suspend (struct usb_
(void) usb_suspend_device (hcd->self.root_hub);
#else
usb_lock_device (hcd->self.root_hub);
- (void) ehci_hub_suspend (hcd);
+ (void) ehci_bus_suspend (hcd);
usb_unlock_device (hcd->self.root_hub);
#endif
@@ -285,7 +285,7 @@ static int ehci_pci_resume (struct usb_h
continue;
if (status & (PORT_SUSPEND | PORT_OWNER)) {
down (&hcd->self.root_hub->serialize);
- retval = ehci_hub_resume (hcd);
+ retval = ehci_bus_resume (hcd);
up (&hcd->self.root_hub->serialize);
break;
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
