diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8dd7248508a9..48128ed08006 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -879,6 +879,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
879 | controller | 879 | controller |
880 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX | 880 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX |
881 | controllers | 881 | controllers |
882 | i8042.notimeout [HW] Ignore timeout condition signalled by conroller | ||
882 | i8042.reset [HW] Reset the controller during init and cleanup | 883 | i8042.reset [HW] Reset the controller during init and cleanup |
883 | i8042.unlock [HW] Unlock (ignore) the keylock | 884 | i8042.unlock [HW] Unlock (ignore) the keylock |
884 | 885 | ||
@@ -1745,7 +1746,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1745 | 1746 | ||
1746 | nousb [USB] Disable the USB subsystem | 1747 | nousb [USB] Disable the USB subsystem |
1747 | 1748 | ||
1748 | nowatchdog [KNL] Disable the lockup detector. | 1749 | nowatchdog [KNL] Disable the lockup detector (NMI watchdog). |
1749 | 1750 | ||
1750 | nowb [ARM] | 1751 | nowb [ARM] |
1751 | 1752 | ||