Merge ../ntfs-2.6-devel

[powerpc.git] / drivers / input / mouse / logips2pp.c

diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 31a59f7..40333d6 100644 (file)
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -117,7 +117,7 @@ static int ps2pp_cmd(struct psmouse *psmouse, unsigned char *param, unsigned cha
        if (psmouse_sliced_command(psmouse, command))
                return -1;
 
-       if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_POLL))
+       if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_POLL | 0x0300))
                return -1;
 
        return 0;
@@ -226,10 +226,13 @@ static struct ps2pp_info *get_model_info(unsigned char model)
                { 80,   PS2PP_KIND_WHEEL,       PS2PP_SIDE_BTN | PS2PP_WHEEL },
                { 81,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 83,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
+               { 85,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 86,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
+               { 87,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 88,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 96,   0,                      0 },
                { 97,   PS2PP_KIND_TP3,         PS2PP_WHEEL | PS2PP_HWHEEL },
+               { 99,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 100,  PS2PP_KIND_MX,                                  /* MX510 */
                                PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN |
                                PS2PP_EXTRA_BTN | PS2PP_NAV_BTN },