summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2015-12-03 15:03:32 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-04 17:29:54 +0100
commit40d581489adbb44a2d1005867d7a7695d61110e6 (patch)
tree990a960d2f39f863249a901ad52e213df6337556 /Documentation/kernel-parameters.txt
parentusb: use BUG_ON() instead of BUG() (diff)
downloadlinux-40d581489adbb44a2d1005867d7a7695d61110e6.tar.xz
linux-40d581489adbb44a2d1005867d7a7695d61110e6.zip
Documentation: nousb is a module parameter
The documentation wrongly implied that it is a core parameter. That is not true. If usbcore is compiled as a module, a module parameter needs a prefix. Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e6b6e056cc11..fd333fbfd2ab 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2575,8 +2575,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
notsc [BUGS=X86-32] Disable Time Stamp Counter
- nousb [USB] Disable the USB subsystem
-
nowatchdog [KNL] Disable both lockup detectors, i.e.
soft-lockup and NMI watchdog (hard-lockup).
@@ -3898,6 +3896,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
USB_REQ_GET_DESCRIPTOR request in milliseconds
(default 5000 = 5.0 seconds).
+ usbcore.nousb [USB] Disable the USB subsystem
+
usbhid.mousepoll=
[USBHID] The interval which mice are to be polled at.