diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 00:54:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 00:54:41 +0200 |
| commit | 7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch) | |
| tree | 5070ec25635008082b47a646d64b4359896c0faa /Documentation | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| parent | Input: i8042 - use kzalloc instead of kcalloc (diff) | |
| download | linux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.tar.xz linux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.zip | |
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. keyboard and can not control its state (Don't attempt to blink the leds) i8042.noaux [HW] Don't check for auxiliary (== mouse) port + i8042.nokbd [HW] Don't check/create keyboard port i8042.nomux [HW] Don't check presence of an active multiplexing controller i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX |