summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2011-10-04 22:50:45 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-04 22:54:05 -0700
commitd6069dae4700cf5290a75002c46b9be8ea7eef3c (patch)
treecb45769b96e3a46f63eb0a5632e544050bfcc8f3
parent8f9068609e8a5b4cbac9e0cf8332b5dcabf05422 (diff)
downloadlinux-2.6-d6069dae4700cf5290a75002c46b9be8ea7eef3c.tar.gz
linux-2.6-d6069dae4700cf5290a75002c46b9be8ea7eef3c.tar.xz
Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
This reverts commit 71c86ce59791bcd67af937bbea719a508079d7c2. The 21UX2 does have touchstrips, but they are in a somewhat- hidden location. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Acked-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/tablet/wacom_wac.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 0dc97ec15c2..9dea71849f4 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1124,11 +1124,8 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
for (i = 0; i < 8; i++)
__set_bit(BTN_0 + i, input_dev->keybit);
- if (wacom_wac->features.type != WACOM_21UX2) {
- input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
- input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
- }
-
+ input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
+ input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);