diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
| commit | 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (patch) | |
| tree | 3849e8457dd8f038ab7da025c708e275b43ea9c1 /Documentation/kernel-parameters.txt | |
| parent | a94130e00038ebeb2f66901a4a4a9e05a03051c1 (diff) | |
| parent | e5119885f00874453e837e3407014b73de2f4741 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index f44bb5567c5b..89cd417651e0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1115,7 +1115,7 @@ running once the system is up. | |||
| 1115 | See Documentation/ramdisk.txt. | 1115 | See Documentation/ramdisk.txt. |
| 1116 | 1116 | ||
| 1117 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to | 1117 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to |
| 1118 | probe for (bare|imps|exps). | 1118 | probe for (bare|imps|exps|lifebook|any). |
| 1119 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports | 1119 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports |
| 1120 | per second. | 1120 | per second. |
| 1121 | psmouse.resetafter= | 1121 | psmouse.resetafter= |