diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /drivers/input | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/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 b1cdd708628d..32d70ed8f41d 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -60,7 +60,7 @@ static unsigned int psmouse_resetafter = 5; | |||
| 60 | module_param_named(resetafter, psmouse_resetafter, uint, 0644); | 60 | module_param_named(resetafter, psmouse_resetafter, uint, 0644); |
| 61 | MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never)."); | 61 | MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never)."); |
| 62 | 62 | ||
| 63 | static unsigned int psmouse_resync_time = 5; | 63 | static unsigned int psmouse_resync_time; |
| 64 | module_param_named(resync_time, psmouse_resync_time, uint, 0644); | 64 | module_param_named(resync_time, psmouse_resync_time, uint, 0644); |
| 65 | MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never)."); | 65 | MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never)."); |
| 66 | 66 | ||