aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorZbigniew Luszpinski <zbiggy@o2.pl>2006-05-29 23:29:19 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2006-05-29 23:29:19 -0400
commit4f8b05efec7a56221c6d1b0e20bcf19671017065 (patch)
treec8d8efb0eb420ce5d3b152b2c63c4dd01ab65361 /drivers/input
parent7363cfc8666692a5263c646e68e54900b536cd7e (diff)
downloadkernel_samsung_smdk4412-4f8b05efec7a56221c6d1b0e20bcf19671017065.tar.gz
kernel_samsung_smdk4412-4f8b05efec7a56221c6d1b0e20bcf19671017065.tar.bz2
kernel_samsung_smdk4412-4f8b05efec7a56221c6d1b0e20bcf19671017065.zip
Input: psmouse - add detection of Logitech TrackMan Wheel trackball
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/logips2pp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 40333d61093..2f0d2884081 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -19,6 +19,7 @@
#define PS2PP_KIND_WHEEL 1
#define PS2PP_KIND_MX 2
#define PS2PP_KIND_TP3 3
+#define PS2PP_KIND_TRACKMAN 4
/* Logitech mouse features */
#define PS2PP_WHEEL 0x01
@@ -223,6 +224,7 @@ static struct ps2pp_info *get_model_info(unsigned char model)
{ 73, 0, PS2PP_SIDE_BTN },
{ 75, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
{ 76, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
+ { 79, PS2PP_KIND_TRACKMAN, PS2PP_WHEEL }, /* TrackMan with wheel */
{ 80, PS2PP_KIND_WHEEL, PS2PP_SIDE_BTN | PS2PP_WHEEL },
{ 81, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
{ 83, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
@@ -298,6 +300,10 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse, struct ps2pp_inf
psmouse->name = "TouchPad 3";
break;
+ case PS2PP_KIND_TRACKMAN:
+ psmouse->name = "TrackMan";
+ break;
+
default:
/*
* Set name to "Mouse" only when using PS2++,