From patchwork Sat Nov 2 19:04:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matthew@incomplete.io X-Patchwork-Id: 3131531 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25BB0BEEB2 for ; Sat, 2 Nov 2013 19:12:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECF6320357 for ; Sat, 2 Nov 2013 19:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F74D20274 for ; Sat, 2 Nov 2013 19:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770Ab3KBTMj (ORCPT ); Sat, 2 Nov 2013 15:12:39 -0400 Received: from [199.73.29.170] ([199.73.29.170]:58018 "EHLO gumby.musicalcarrion.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751096Ab3KBTMi (ORCPT ); Sat, 2 Nov 2013 15:12:38 -0400 X-Greylist: delayed 459 seconds by postgrey-1.27 at vger.kernel.org; Sat, 02 Nov 2013 15:12:38 EDT Received: from prickle.gateway.2wire.net (99-119-198-230.lightspeed.sntcca.sbcglobal.net [99.119.198.230]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gumby.musicalcarrion.com (Postfix) with ESMTPSA id AC1BB53441; Sat, 2 Nov 2013 12:01:22 -0700 (PDT) From: matthew@incomplete.io To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Matthew Geddes Subject: [PATCH] INPUT: wacom: Added definition for Wacom CTH680 The Wacom Creative Pen & Touch Tablet M (CTH680, 056A:0303) is a newer revision of the Bamboo series. This patch adds product 0303 to wacom.ko. Date: Sat, 2 Nov 2013 12:04:49 -0700 Message-Id: <1383419089-31248-1-git-send-email-matthew@incomplete.io> X-Mailer: git-send-email 1.8.3.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Geddes Signed-off-by: Matthew Geddes Nacked-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index c59b797..5015269 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -2128,6 +2128,9 @@ static const struct wacom_features wacom_features_0x300 = static const struct wacom_features wacom_features_0x301 = { "Wacom Bamboo One M", WACOM_PKGLEN_BBPEN, 21648, 13530, 1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x303 = + { "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530, + 1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x6004 = { "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255, 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -2258,6 +2261,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x10F) }, { USB_DEVICE_WACOM(0x300) }, { USB_DEVICE_WACOM(0x301) }, + { USB_DEVICE_WACOM(0x303) }, { USB_DEVICE_WACOM(0x304) }, { USB_DEVICE_WACOM(0x4001) }, { USB_DEVICE_WACOM(0x47) },