---

yaml --- r: 108421 b: refs/heads/master c: fa41019 h: refs/heads/master i: 108419: fe9c59e v: v3
git-mirror · Aug 14, 2008 · 8e93d35 · 8e93d35
1 parent fd4bcb5
commit 8e93d35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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)
 {