summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-13 20:12:31 -0800
committerBen Hutchings <ben@decadent.org.uk>2013-01-03 03:32:43 +0000
commitbd185a28ead5816b2adf5e49ad4dd3dff3b70f77 (patch)
tree5e2a2760ca108d3244ce542fc715b323312177e9 /drivers/hid
parent53f02039f794725f843494a36d82f045d78ba697 (diff)
HID: hid-magicmouse: Add pointer and buttonpad properties for Magic Trackpad
commit 503f7d53b368c8e4e13a7756220c0536fcf1a034 upstream. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-magicmouse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 2ab71758e2e2..7cf3ffe4b7bc 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -418,6 +418,8 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
__set_bit(BTN_TOOL_TRIPLETAP, input->keybit);
__set_bit(BTN_TOOL_QUADTAP, input->keybit);
__set_bit(BTN_TOUCH, input->keybit);
+ __set_bit(INPUT_PROP_POINTER, input->propbit);
+ __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
}
if (report_touches) {