---

yaml --- r: 127244 b: refs/heads/master c: 785895f h: refs/heads/master v: v3
git-mirror · Jan 7, 2009 · b5836bd · b5836bd
1 parent c60a812
commit b5836bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96983d2d861bf94b7f70bc47ac3c5b289f519a2d
+refs/heads/master: 785895ff1fedddd09576d2c600d90404fef6506c
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
@@ -954,8 +954,12 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
 }
 EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg);
 
-/* format to disable USB on kernel command line is: nousb */
-__module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444);
+/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */
+#ifdef MODULE
+module_param(nousb, bool, 0444);
+#else
+core_param(nousb, nousb, bool, 0444);
+#endif
 
 /*
  * for external read access to <nousb>