tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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"

Linus Torvalds 538d2882 71277a66

+2 -5
unified split
+2 -5
drivers/input/tablet/wacom_wac.c
··· 1124 1124 for (i = 0; i < 8; i++) 1125 1125 __set_bit(BTN_0 + i, input_dev->keybit); 1126 1126 1127 - if (wacom_wac->features.type != WACOM_21UX2) { 1128 - input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); 1129 - input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); 1130 - } 1131 - 1127 + input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); 1128 + input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); 1132 1129 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); 1133 1130 1134 1131 __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);