commit 538d2882213ef4f076108f3edda2c39a584c4c2b
author Linus Torvalds <torvalds@linux-foundation.org> Wed Oct 05 09:22:38 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Oct 05 09:22:38 2011 -0700
tree 130e954abe7c63a49b7a99fcac1dfacb5c5edc1d
parent 71277a6635890ab401f0a9dd7d5d9e652eea44ef
parent d6069dae4700cf5290a75002c46b9be8ea7eef3c

Merge branch 'for-linus' of git://github.com/dtor/input

* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

drivers/input/tablet/wacom_wac.c

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 0dc97ec..9dea718 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1124,11 +1124,8 @@
 		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);