lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source
This commit is contained in:
Dmitry Torokhov
2006-03-13 23:36:52 -05:00
parent 51c38f9bce 3759fa9c55
commit 58a343f22e
764 changed files with 10244 additions and 8345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/mouse/psmouse-base.c
View File

@@ -60,7 +60,7 @@ static unsigned int psmouse_resetafter = 5;
module_param_named(resetafter, psmouse_resetafter, uint, 0644);
MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never).");
static unsigned int psmouse_resync_time = 5;
static unsigned int psmouse_resync_time;
module_param_named(resync_time, psmouse_resync_time, uint, 0644);
MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never).");