From 5e1221d9242c8c986596a622bf5f307968f5f011 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 28 Mar 2013 21:09:46 +0000 Subject: [PATCH] --- yaml --- r: 364485 b: refs/heads/master c: 70b55c2ad0e5c8bbbb36cedf6a37f9d029cfd403 h: refs/heads/master i: 364483: 13b6418e616fb41d388843964d5c92fe4b0523e3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-q.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c034ab6c457f..21cee55cb28f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05768918b9a122ce21bd55950df5054ff6c57f28 +refs/heads/master: 70b55c2ad0e5c8bbbb36cedf6a37f9d029cfd403 diff --git a/trunk/drivers/usb/host/ehci-q.c b/trunk/drivers/usb/host/ehci-q.c index 7562d76f9c53..d34b399b78e2 100644 --- a/trunk/drivers/usb/host/ehci-q.c +++ b/trunk/drivers/usb/host/ehci-q.c @@ -1293,9 +1293,8 @@ static void unlink_empty_async(struct ehci_hcd *ehci) } } -#ifdef CONFIG_PM /* The root hub is suspended; unlink all the async QHs */ -static void unlink_empty_async_suspended(struct ehci_hcd *ehci) +static void __maybe_unused unlink_empty_async_suspended(struct ehci_hcd *ehci) { struct ehci_qh *qh; @@ -1306,7 +1305,6 @@ static void unlink_empty_async_suspended(struct ehci_hcd *ehci) } start_iaa_cycle(ehci); } -#endif /* makes sure the async qh will become idle */ /* caller must own ehci->lock */