From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 03:27:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'hid/for-next'
X-Git-Tag: next-20111011~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bc42ee6eec3cd7876b620a45703659a43c5d4c0;p=karo-tx-linux.git

Merge remote-tracking branch 'hid/for-next'

Conflicts:
	drivers/hid/hid-wacom.c
---

8bc42ee6eec3cd7876b620a45703659a43c5d4c0
diff --cc drivers/hid/hid-wacom.c
index 72ca689b6474,519f56c787bb..14927287a3fd
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@@ -304,6 -304,46 +304,48 @@@ static int wacom_raw_event(struct hid_d
  	return 1;
  }
  
+ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+ 	struct hid_field *field, struct hid_usage *usage, unsigned long **bit,
+ 								int *max)
+ {
+ 	struct input_dev *input = hi->input;
+ 
++	__set_bit(INPUT_PROP_POINTER, input->propbit);
++
+ 	/* Basics */
+ 	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
+ 
+ 	__set_bit(REL_WHEEL, input->relbit);
+ 
+ 	__set_bit(BTN_TOOL_PEN, input->keybit);
+ 	__set_bit(BTN_TOUCH, input->keybit);
+ 	__set_bit(BTN_STYLUS, input->keybit);
+ 	__set_bit(BTN_STYLUS2, input->keybit);
+ 	__set_bit(BTN_LEFT, input->keybit);
+ 	__set_bit(BTN_RIGHT, input->keybit);
+ 	__set_bit(BTN_MIDDLE, input->keybit);
+ 
+ 	/* Pad */
+ 	input->evbit[0] |= BIT(EV_MSC);
+ 
+ 	__set_bit(MSC_SERIAL, input->mscbit);
+ 
+ 	__set_bit(BTN_0, input->keybit);
+ 	__set_bit(BTN_1, input->keybit);
+ 	__set_bit(BTN_TOOL_FINGER, input->keybit);
+ 
+ 	/* Distance, rubber and mouse */
+ 	__set_bit(BTN_TOOL_RUBBER, input->keybit);
+ 	__set_bit(BTN_TOOL_MOUSE, input->keybit);
+ 
+ 	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);
+ 	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);
+ 	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);
+ 	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
+ 
+ 	return 0;
+ }
+ 
  static int wacom_probe(struct hid_device *hdev,
  		const struct hid_device_id *id)
  {