From: Andrew Morton NFI whether this is right - the -mm USB tree is a minor trainwreck. Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/usb/host/ehci-pci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/usb/host/ehci-pci.c~gregkh-usb-usb-rename-hcd-hub_suspend-to-hcd-bus_suspend-fix drivers/usb/host/ehci-pci.c --- devel/drivers/usb/host/ehci-pci.c~gregkh-usb-usb-rename-hcd-hub_suspend-to-hcd-bus_suspend-fix 2005-10-23 14:58:50.000000000 -0700 +++ devel-akpm/drivers/usb/host/ehci-pci.c 2005-10-23 15:07:09.000000000 -0700 @@ -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; } _