diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/input | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 19b1b0121726..ad6217467676 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -58,7 +58,7 @@ static unsigned int psmouse_resetafter = 5; | |||
| 58 | module_param_named(resetafter, psmouse_resetafter, uint, 0644); | 58 | module_param_named(resetafter, psmouse_resetafter, uint, 0644); |
| 59 | MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never)."); | 59 | MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never)."); |
| 60 | 60 | ||
| 61 | static unsigned int psmouse_resync_time = 5; | 61 | static unsigned int psmouse_resync_time; |
| 62 | module_param_named(resync_time, psmouse_resync_time, uint, 0644); | 62 | module_param_named(resync_time, psmouse_resync_time, uint, 0644); |
| 63 | MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never)."); | 63 | MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never)."); |
| 64 | 64 | ||