From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754189Ab2L1TQu (ORCPT ); Fri, 28 Dec 2012 14:16:50 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:54837 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754095Ab2L1TQk (ORCPT ); Fri, 28 Dec 2012 14:16:40 -0500 Message-Id: <20121228190330.913310882@decadent.org.uk> User-Agent: quilt/0.60-1 Date: Fri, 28 Dec 2012 20:03:34 +0100 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Chase Douglas , Jiri Kosina Subject: [ 004/173] HID: hid-magicmouse: Add pointer and buttonpad properties for Magic Trackpad In-Reply-To: <20121228190330.025298996@decadent.org.uk> X-SA-Exim-Connect-IP: 151.217.219.220 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chase Douglas commit 503f7d53b368c8e4e13a7756220c0536fcf1a034 upstream. Signed-off-by: Chase Douglas Signed-off-by: Jiri Kosina Signed-off-by: Ben Hutchings --- drivers/hid/hid-magicmouse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 2ab7175..7cf3ffe 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) {