From 466d8d3156a1c7de3506b64801eb57fe5d57b7b8 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 24 Oct 2006 12:02:31 -0400 Subject: [PATCH] --- yaml --- r: 41239 b: refs/heads/master c: b1878440d46a0dc357ed5c9687c534e20955e940 h: refs/heads/master i: 41237: 0e2073e3282c9e84b3cea8e7e9a59f4915052d5a 41235: 1a90b9875927c95bd5d2865645f31980d80dd446 41231: 40c3393c43f0bba71d1386eb08a5ef3efa6598b4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-hub.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 268974be2da1..9e817b8f3c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93c8bf45e083b89dffe3a708363c15c1b220c723 +refs/heads/master: b1878440d46a0dc357ed5c9687c534e20955e940 diff --git a/trunk/drivers/usb/host/ohci-hub.c b/trunk/drivers/usb/host/ohci-hub.c index 6995ea36f2e8..99357b99d133 100644 --- a/trunk/drivers/usb/host/ohci-hub.c +++ b/trunk/drivers/usb/host/ohci-hub.c @@ -50,6 +50,10 @@ static void ohci_rhsc_enable (struct usb_hcd *hcd) static void dl_done_list (struct ohci_hcd *); static void finish_unlinks (struct ohci_hcd *, u16); +#ifdef CONFIG_PM +static int ohci_restart(struct ohci_hcd *ohci); +#endif + static int ohci_rh_suspend (struct ohci_hcd *ohci, int autostop) __releases(ohci->lock) __acquires(ohci->lock) @@ -132,8 +136,6 @@ static inline struct ed *find_head (struct ed *ed) return ed; } -static int ohci_restart (struct ohci_hcd *ohci); - /* caller has locked the root hub */ static int ohci_rh_resume (struct ohci_hcd *ohci) __releases(ohci->lock)