Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 538d2882 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 71277a66 d6069dae

drivers/input/tablet/wacom_wac.c

+2 −5
Original line number Diff line number Diff line
@@ -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_Z, -900, 899, 0, 0);



		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);