diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/input/mouse/psmouse-base.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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 8bc9f51ae6c2..343afa38f4c2 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); |