---

yaml --- r: 108448 b: refs/heads/master c: 9ff7843 h: refs/heads/master v: v3
git-mirror · Aug 14, 2008 · c95a8ef · c95a8ef
1 parent 3d85053
commit c95a8ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d28525f8866244a77b677c0470d4859cb2b6c2a8
+refs/heads/master: 9ff78433f0aeb1f731a22a90206b685df4eaf52e
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
@@ -774,8 +774,6 @@ 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
  * because it doesn't support suspend/resume.
@@ -822,6 +820,8 @@ void usb_rebind_intf(struct usb_interface *intf)
 		dev_warn(&intf->dev, "rebind failed: %d\n", rc);
 }
 
+#ifdef CONFIG_PM
+
 #define DO_UNBIND	0
 #define DO_REBIND	1