From patchwork Sun Jan 23 23:21:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 499491 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0NNM5er010495 for ; Sun, 23 Jan 2011 23:22:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752608Ab1AWXWF (ORCPT ); Sun, 23 Jan 2011 18:22:05 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:65252 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353Ab1AWXWD (ORCPT ); Sun, 23 Jan 2011 18:22:03 -0500 Received: by iyj18 with SMTP id 18so3430068iyj.19 for ; Sun, 23 Jan 2011 15:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=5pgDQDXGNcIusOso0L8RTmC4GMZfPQ8EU6FZ23yBty8=; b=QOHjA2bF0+JzMb/FziAzs2n2NajaSJ0X9tp63jabcibKe7O79ZT8bZ+4+XM1RBFw0M yzxBxV4CCQrmBdF8GOzNVFJrboG6mbepk2LEa/n7W/O7SdAJsMJKQlLQspbPU13E5Tgv hRsdRMSyMk01WRRstNGlHEqimwnZKcUWUGoFo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=EcJO7hqqTUA+btVnZ6JQ44KBVPzU4b2m1g8BVwtXCz4vbVrLUuEopB304zrR+5/c4l Yy55V6nB5E8brA78/00IsrzT17VCO1mFBpp5/kVl15mW54FWfz0HD6V5FVkK4EQwFXB4 r+a8LuDlIwXadD3y8LF8KSwQRKRmgeeMcSYrg= Received: by 10.231.174.71 with SMTP id s7mr3860928ibz.56.1295824923295; Sun, 23 Jan 2011 15:22:03 -0800 (PST) Received: from localhost.localdomain (c-71-193-252-72.hsd1.wa.comcast.net [71.193.252.72]) by mx.google.com with ESMTPS id i16sm10430607ibl.6.2011.01.23.15.22.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 23 Jan 2011 15:22:02 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , Ping Cheng Subject: [PATCH 1/2] input : wacom - Add 2 Bamboo Pen and touch models Date: Sun, 23 Jan 2011 15:21:33 -0800 Message-Id: <1295824893-12427-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 23 Jan 2011 23:22:30 +0000 (UTC) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 5187829..f44c822 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1426,6 +1426,10 @@ static struct wacom_features wacom_features_0xD3 = { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; static const struct wacom_features wacom_features_0xD4 = { "Wacom Bamboo Pen", WACOM_PKGLEN_BBFUN, 14720, 9200, 255, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD6 = + { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD7 = + { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; static struct wacom_features wacom_features_0xD8 = { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; static struct wacom_features wacom_features_0xDA = @@ -1507,6 +1511,8 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xD2) }, { USB_DEVICE_WACOM(0xD3) }, { USB_DEVICE_WACOM(0xD4) }, + { USB_DEVICE_WACOM(0xD6) }, + { USB_DEVICE_WACOM(0xD7) }, { USB_DEVICE_WACOM(0xD8) }, { USB_DEVICE_WACOM(0xDA) }, { USB_DEVICE_WACOM(0xDB) },