From patchwork Fri Feb 24 23:05:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 142995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 64229B6FB9 for ; Sat, 25 Feb 2012 10:05:41 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S14Cg-0007mZ-96; Fri, 24 Feb 2012 23:05:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S14Cc-0007ju-PC for kernel-team@lists.ubuntu.com; Fri, 24 Feb 2012 23:05:26 +0000 Received: from c-67-170-185-42.hsd1.or.comcast.net ([67.170.185.42] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1S14Cc-0001Ta-Dl for kernel-team@lists.ubuntu.com; Fri, 24 Feb 2012 23:05:26 +0000 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [Precise][PATCH 1/3] UBUNTU: SAUCE: (drop after 3.3) HID: hid-magicmouse: Add pointer and buttonpad properties for Magic Trackpad Date: Fri, 24 Feb 2012 15:05:49 -0800 Message-Id: <1330124751-31888-2-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330124751-31888-1-git-send-email-chase.douglas@canonical.com> References: <1330124751-31888-1-git-send-email-chase.douglas@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Chase Douglas Signed-off-by: Jiri Kosina (cherry picked from commit 503f7d53b368c8e4e13a7756220c0536fcf1a034 from Jiri Kosina's HID for-next branch) --- drivers/hid/hid-magicmouse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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) {