diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 14:09:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 14:09:19 -0700 |
| commit | 279b1e0fd90ef63c7acb34a5ca573f065a6fefb4 (patch) | |
| tree | 25dfe9e76c375c2357096fc4ec334c5b00790ce0 /drivers/hid | |
| parent | abbe0d3c26c545930492981cbd64be340ff41e05 (diff) | |
| parent | 8f9068609e8a5b4cbac9e0cf8332b5dcabf05422 (diff) | |
| download | blackbird-op-linux-279b1e0fd90ef63c7acb34a5ca573f065a6fefb4.tar.gz blackbird-op-linux-279b1e0fd90ef63c7acb34a5ca573f065a6fefb4.zip | |
Merge branch 'for-linus' of git://github.com/dtor/input
* 'for-linus' of git://github.com/dtor/input:
Input: wacom - fix touch parsing on newer Bamboos
Input: bcm5974 - add MacBookAir4,1 trackpad support
Input: wacom - add POINTER and DIRECT device properties
Input: adp5588-keys - remove incorrect modalias
Input: cm109 - fix checking return value of usb_control_msg
Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner
Input: wacom - remove pressure for touch devices
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-wacom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index a597039d0755..72ca689b6474 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -373,6 +373,8 @@ static int wacom_probe(struct hid_device *hdev, hidinput = list_entry(hdev->inputs.next, struct hid_input, list); input = hidinput->input; + __set_bit(INPUT_PROP_POINTER, input->propbit); + /* Basics */ input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL); |
