diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/input/mouse/psmouse-base.c | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index ec0119459bc6..9fb7eb6b0f71 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -485,13 +485,6 @@ static int im_explorer_detect(struct psmouse *psmouse, int set_properties) | |||
| 485 | param[0] = 40; | 485 | param[0] = 40; |
| 486 | ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE); | 486 | ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE); |
| 487 | 487 | ||
| 488 | param[0] = 200; | ||
| 489 | ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE); | ||
| 490 | param[0] = 200; | ||
| 491 | ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE); | ||
| 492 | param[0] = 60; | ||
| 493 | ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE); | ||
| 494 | |||
| 495 | if (set_properties) { | 488 | if (set_properties) { |
| 496 | set_bit(BTN_MIDDLE, psmouse->dev->keybit); | 489 | set_bit(BTN_MIDDLE, psmouse->dev->keybit); |
| 497 | set_bit(REL_WHEEL, psmouse->dev->relbit); | 490 | set_bit(REL_WHEEL, psmouse->dev->relbit); |