From 347fef0615feec25f205e62c9cf7ab3174850d12 Mon Sep 17 00:00:00 2001
From: Chase Douglas <chase.douglas@canonical.com>
Date: Mon, 13 Feb 2012 20:12:31 -0800
Subject: [PATCH] --- yaml --- r: 291659 b: refs/heads/master c:
 503f7d53b368c8e4e13a7756220c0536fcf1a034 h: refs/heads/master i:   291657:
 924e0ae37f894856423a0f9ce91fcff25634189e   291655:
 151d4338118a78214229b7896cbf27e327d658f8 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/hid/hid-magicmouse.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 20043053f0c2..ad4ffa30a785 100644
--- 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
index 2ab71758e2e2..7cf3ffe4b7bc 100644
--- 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) {