summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-06-28 07:07:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-28 07:07:56 +0200
commit8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch)
treec43b6c2fdf1b68b66906a2de69446dcec0f9af6b /Documentation/kernel-parameters.txt
parent[PATCH] PCI: use the MCFG table to properly access pci devices (x86-64) (diff)
parent[PATCH] cfq build fix (diff)
downloadlinux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.tar.xz
linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.zip
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.txt2
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.
See Documentation/ramdisk.txt.
psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to
- probe for (bare|imps|exps).
+ probe for (bare|imps|exps|lifebook|any).
psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports
per second.
psmouse.resetafter=