diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/usb.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 39e6b61b898a..6ee2b5359a83 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -46,7 +46,6 @@ | |||
46 | const char *usbcore_name = "usbcore"; | 46 | const char *usbcore_name = "usbcore"; |
47 | 47 | ||
48 | static int nousb; /* Disable USB when built into kernel image */ | 48 | static int nousb; /* Disable USB when built into kernel image */ |
49 | /* Not honored on modular build */ | ||
50 | 49 | ||
51 | 50 | ||
52 | /** | 51 | /** |
@@ -1096,18 +1095,8 @@ struct bus_type usb_bus_type = { | |||
1096 | .resume = usb_generic_resume, | 1095 | .resume = usb_generic_resume, |
1097 | }; | 1096 | }; |
1098 | 1097 | ||
1099 | #ifndef MODULE | ||
1100 | |||
1101 | static int __init usb_setup_disable(char *str) | ||
1102 | { | ||
1103 | nousb = 1; | ||
1104 | return 1; | ||
1105 | } | ||
1106 | |||
1107 | /* format to disable USB on kernel command line is: nousb */ | 1098 | /* format to disable USB on kernel command line is: nousb */ |
1108 | __setup("nousb", usb_setup_disable); | 1099 | __module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444); |
1109 | |||
1110 | #endif | ||
1111 | 1100 | ||
1112 | /* | 1101 | /* |
1113 | * for external read access to <nousb> | 1102 | * for external read access to <nousb> |