---

yaml --- r: 291659 b: refs/heads/master c: 503f7d5 h: refs/heads/master i: 291657: 924e0ae 291655: 151d433 v: v3
git-mirror · Feb 21, 2012 · 347fef0 · 347fef0
1 parent 2f8558b
commit 347fef0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fdc18d15151f3e7cc43070ec8d13570431b5abc
+refs/heads/master: 503f7d53b368c8e4e13a7756220c0536fcf1a034
diff --git a/trunk/drivers/hid/hid-magicmouse.c b/trunk/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) {