|
Chuck Ebbert |
b67156c |
From: Manoj Iyer <manoj.iyer@canonical.com>
|
|
Chuck Ebbert |
b67156c |
Date: Fri, 1 Apr 2011 05:39:43 +0000 (-0700)
|
|
Chuck Ebbert |
b67156c |
Subject: Input: wacom - add support for Lenovo tablet ID (0xE6)
|
|
Chuck Ebbert |
b67156c |
X-Git-Tag: v2.6.39-rc2~4^2~1
|
|
Chuck Ebbert |
b67156c |
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=26fcd2a7618db6c16be6aa3e56c0f3c25381e5a3
|
|
Chuck Ebbert |
b67156c |
|
|
Chuck Ebbert |
b67156c |
Input: wacom - add support for Lenovo tablet ID (0xE6)
|
|
Chuck Ebbert |
b67156c |
[ 2.6.38 backport ]
|
|
Chuck Ebbert |
b67156c |
|
|
Chuck Ebbert |
b67156c |
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
|
|
Chuck Ebbert |
b67156c |
Acked-by: Ping Cheng <pingc@wacom.com>
|
|
Chuck Ebbert |
b67156c |
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
|
|
Chuck Ebbert |
b67156c |
---
|
|
Chuck Ebbert |
b67156c |
RHBZ 708307
|
|
Chuck Ebbert |
b67156c |
|
|
Chuck Ebbert |
b67156c |
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
|
|
Chuck Ebbert |
b67156c |
index c87d94f..08ba5ad 100644
|
|
Chuck Ebbert |
b67156c |
--- a/drivers/input/tablet/wacom_wac.c
|
|
Chuck Ebbert |
b67156c |
+++ b/drivers/input/tablet/wacom_wac.c
|
|
Chuck Ebbert |
b67156c |
@@ -1439,6 +1439,8 @@ static const struct wacom_features wacom_features_0xE2 =
|
|
Chuck Ebbert |
b67156c |
{ "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG };
|
|
Chuck Ebbert |
b67156c |
static const struct wacom_features wacom_features_0xE3 =
|
|
Chuck Ebbert |
b67156c |
{ "Wacom ISDv4 E3", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG };
|
|
Chuck Ebbert |
b67156c |
+static const struct wacom_features wacom_features_0xE6 =
|
|
Chuck Ebbert |
b67156c |
+ { "Wacom ISDv4 E6", WACOM_PKGLEN_TPC2FG, 27760, 15694, 255, 0, TABLETPC2FG };
|
|
Chuck Ebbert |
b67156c |
static const struct wacom_features wacom_features_0x47 =
|
|
Chuck Ebbert |
b67156c |
{ "Wacom Intuos2 6x8", WACOM_PKGLEN_INTUOS, 20320, 16240, 1023, 31, INTUOS };
|
|
Chuck Ebbert |
b67156c |
static struct wacom_features wacom_features_0xD0 =
|
|
Chuck Ebbert |
b67156c |
@@ -1561,6 +1564,7 @@ const struct usb_device_id wacom_ids[] = {
|
|
Chuck Ebbert |
b67156c |
{ USB_DEVICE_WACOM(0x9F) },
|
|
Chuck Ebbert |
b67156c |
{ USB_DEVICE_WACOM(0xE2) },
|
|
Chuck Ebbert |
b67156c |
{ USB_DEVICE_WACOM(0xE3) },
|
|
Chuck Ebbert |
b67156c |
+ { USB_DEVICE_WACOM(0xE6) },
|
|
Chuck Ebbert |
b67156c |
{ USB_DEVICE_WACOM(0x47) },
|
|
Chuck Ebbert |
b67156c |
{ USB_DEVICE_LENOVO(0x6004) },
|
|
Chuck Ebbert |
b67156c |
{ }
|