diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
| commit | 7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch) | |
| tree | 5070ec25635008082b47a646d64b4359896c0faa /Documentation | |
| parent | 2b8dfec8c8fa4ba5bc946a602e94e99861462cad (diff) | |
| parent | d39969deee4b541be4ee5789a2e4c14511c886e2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index d2f0c67ba1fb..db2603ceabba 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -549,6 +549,7 @@ running once the system is up. | |||
| 549 | keyboard and can not control its state | 549 | keyboard and can not control its state |
| 550 | (Don't attempt to blink the leds) | 550 | (Don't attempt to blink the leds) |
| 551 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port | 551 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port |
| 552 | i8042.nokbd [HW] Don't check/create keyboard port | ||
| 552 | i8042.nomux [HW] Don't check presence of an active multiplexing | 553 | i8042.nomux [HW] Don't check presence of an active multiplexing |
| 553 | controller | 554 | controller |
| 554 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX | 555 | i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX |