From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 7 Aug 2014 06:36:12 +0000 (-0700)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v3.17-rc1~72^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e2aa2ed08e2e280121dc7cf5609c87d464f12ef;p=thirdparty%2Flinux.git

Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.
---

5e2aa2ed08e2e280121dc7cf5609c87d464f12ef
diff --cc drivers/hid/wacom_wac.c
index e73cf2c71f355,d4a2d533a444d..aa6a08eb7ad68
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@ -1871,12 -1943,11 +1937,7 @@@ int wacom_setup_input_capabilities(stru
  
  		if (features->device_type == BTN_TOOL_FINGER) {
  
- 			__set_bit(BTN_LEFT, input_dev->keybit);
- 			__set_bit(BTN_FORWARD, input_dev->keybit);
- 			__set_bit(BTN_BACK, input_dev->keybit);
- 			__set_bit(BTN_RIGHT, input_dev->keybit);
- 
  			if (features->touch_max) {
 -				/* touch interface */
 -				unsigned int flags = INPUT_MT_POINTER;
 -
 -				__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
  				if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
  					input_set_abs_params(input_dev,
  						     ABS_MT_TOUCH_MAJOR,