From 80220d51ea190894261466ac423da46b57e56d7c Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@redhat.com>
Date: Tue, 20 Dec 2005 14:15:04 -0800
Subject: [PATCH] --- yaml --- r: 15507 b: refs/heads/master c:
 aafbf24a1129480157af7ee780eddcea9b76ee5c h: refs/heads/master i:   15505:
 4d89a22ebc5a2f156df3fc985e95d2b7ca24316a   15503:
 876003036926414eed33251afabec546e65507ba v: v3

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

diff --git a/[refs] b/[refs]
index 737db077edec..99b7cfb3184d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e0f76c6bbc0d26cd9625876f7beeb7b002f39bf
+refs/heads/master: aafbf24a1129480157af7ee780eddcea9b76ee5c
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
index 39e6b61b898a..6ee2b5359a83 100644
--- a/trunk/drivers/usb/core/usb.c
+++ b/trunk/drivers/usb/core/usb.c
@@ -46,7 +46,6 @@
 const char *usbcore_name = "usbcore";
 
 static int nousb;	/* Disable USB when built into kernel image */
-			/* Not honored on modular build */
 
 
 /**
@@ -1096,18 +1095,8 @@ struct bus_type usb_bus_type = {
 	.resume =	usb_generic_resume,
 };
 
-#ifndef MODULE
-
-static int __init usb_setup_disable(char *str)
-{
-	nousb = 1;
-	return 1;
-}
-
 /* format to disable USB on kernel command line is: nousb */
-__setup("nousb", usb_setup_disable);
-
-#endif
+__module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444);
 
 /*
  * for external read access to <nousb>