diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
tree | 470cce472be3b08c160e0c569648e7228651b12a /drivers/input/mouse/logips2pp.c | |
parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
-rw-r--r-- | drivers/input/mouse/logips2pp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index c88520d3d13c..40333d61093c 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c | |||
@@ -232,6 +232,7 @@ static struct ps2pp_info *get_model_info(unsigned char model) | |||
232 | { 88, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | 232 | { 88, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, |
233 | { 96, 0, 0 }, | 233 | { 96, 0, 0 }, |
234 | { 97, PS2PP_KIND_TP3, PS2PP_WHEEL | PS2PP_HWHEEL }, | 234 | { 97, PS2PP_KIND_TP3, PS2PP_WHEEL | PS2PP_HWHEEL }, |
235 | { 99, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | ||
235 | { 100, PS2PP_KIND_MX, /* MX510 */ | 236 | { 100, PS2PP_KIND_MX, /* MX510 */ |
236 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | | 237 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | |
237 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, | 238 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, |