From 8e93d35824cd0f208a711c58c085bc9bb4d83800 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Tue, 29 Jul 2008 05:54:31 +0400
Subject: [PATCH] --- yaml --- r: 108421 b: refs/heads/master c:
 fa41019c7aa172fde075849834409d23eb49f582 h: refs/heads/master i:   108419:
 fe9c59ed9acfa8a67709f68afdc47c30aa8b6dda v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/core/driver.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 597c54b7ff1d..f632067834aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4f4d58734916e816d4b4a7cf61b3fc22ce02683
+refs/heads/master: fa41019c7aa172fde075849834409d23eb49f582
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
index ddb54e14a5c5..6618bc89eb69 100644
--- a/trunk/drivers/usb/core/driver.c
+++ b/trunk/drivers/usb/core/driver.c
@@ -774,6 +774,7 @@ void usb_deregister(struct usb_driver *driver)
 }
 EXPORT_SYMBOL_GPL(usb_deregister);
 
+#ifdef CONFIG_PM
 
 /* Forced unbinding of a USB interface driver, either because
  * it doesn't support pre_reset/post_reset/reset_resume or
@@ -872,8 +873,6 @@ static void do_unbind_rebind(struct usb_device *udev, int action)
 	}
 }
 
-#ifdef CONFIG_PM
-
 /* Caller has locked udev's pm_mutex */
 static int usb_suspend_device(struct usb_device *udev, pm_message_t msg)
 {