diff options
author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /Documentation/kernel-parameters.txt | |
parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 96d924eb7b64..0f71251f12b9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1119,7 +1119,7 @@ running once the system is up. | |||
1119 | See Documentation/ramdisk.txt. | 1119 | See Documentation/ramdisk.txt. |
1120 | 1120 | ||
1121 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to | 1121 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to |
1122 | probe for (bare|imps|exps). | 1122 | probe for (bare|imps|exps|lifebook|any). |
1123 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports | 1123 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports |
1124 | per second. | 1124 | per second. |
1125 | psmouse.resetafter= | 1125 | psmouse.resetafter= |