]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-linus' of git://github.com/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (09:22 -0700)
* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

drivers/input/tablet/wacom_wac.c

index 0dc97ec15c28cc59cda96622951c44c0a4fab6fd..9dea71849f40c2694442e3d206fde86f5a1c09fb 100644 (file)
@@ -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);