From b5836bda7ecab4658839696ebcee3f973c25f786 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 22 Nov 2008 13:01:06 +1030
Subject: [PATCH] --- yaml --- r: 127244 b: refs/heads/master c:
 785895ff1fedddd09576d2c600d90404fef6506c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b6e726756654..6f31d57e222d 100644
--- 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
index 44f2fc750b6d..51854c2bc912 100644
--- 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>