diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /Documentation | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
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 1150444a21ab..c44bf65b8cd9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -796,6 +796,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 796 | Defaults to the default architecture's huge page size | 796 | Defaults to the default architecture's huge page size |
| 797 | if not specified. | 797 | if not specified. |
| 798 | 798 | ||
| 799 | i8042.debug [HW] Toggle i8042 debug mode | ||
| 799 | i8042.direct [HW] Put keyboard port into non-translated mode | 800 | i8042.direct [HW] Put keyboard port into non-translated mode |
| 800 | i8042.dumbkbd [HW] Pretend that controller can only read data from | 801 | i8042.dumbkbd [HW] Pretend that controller can only read data from |
| 801 | keyboard and cannot control its state | 802 | keyboard and cannot control its state |