diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:30:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:30:33 -0500 |
| commit | 407cf84f956ee4b52da5508d5357b8ae212ff77c (patch) | |
| tree | b3efbcb770e1202b65aee2fe70ea5a407a60e6a5 /drivers/input/mouse/logips2pp.c | |
| parent | b3ce1debe2685383a9ad6ace9c49869c3968c013 (diff) | |
| parent | 0aeafa77558fc1b44b0f39a4d9e5bd9316420788 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
| -rw-r--r-- | drivers/input/mouse/logips2pp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index 0f69ff46c1ae..31a59f7abfaf 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c | |||
| @@ -217,6 +217,9 @@ static struct ps2pp_info *get_model_info(unsigned char model) | |||
| 217 | { 61, PS2PP_KIND_MX, /* MX700 */ | 217 | { 61, PS2PP_KIND_MX, /* MX700 */ |
| 218 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | | 218 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | |
| 219 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, | 219 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, |
| 220 | { 66, PS2PP_KIND_MX, /* MX3100 reciver */ | ||
| 221 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | | ||
| 222 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN | PS2PP_HWHEEL }, | ||
| 220 | { 73, 0, PS2PP_SIDE_BTN }, | 223 | { 73, 0, PS2PP_SIDE_BTN }, |
| 221 | { 75, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | 224 | { 75, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, |
| 222 | { 76, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | 225 | { 76, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, |