From ef63121d6e0fb6ba474e3a61f7a34ede93aa239f Mon Sep 17 00:00:00 2001 From: Stephan Frank Date: Thu, 7 Mar 2013 14:08:50 -0800 Subject: [PATCH] --- yaml --- r: 361023 b: refs/heads/master c: 586948372189d33ceca9d89fb0c791ef4d53d8ad h: refs/heads/master i: 361021: b0af6af0bc611df0588f6833f2385cd822a4d2fa 361019: d5d866054d732fae2d707b0fc780b39913f697b7 361015: 6341b259d012694218e849ce56d269d80e5b3fc1 361007: a7d01542c96d7a8ab420acf8b318d18ceeb6a833 360991: 5ed30654d5a0099cca7e755a0f96103ef28c7115 360959: b167cdde10c3dd90a1334c3b5e4ced17befe8ed3 v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_wac.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 073e8177ff40..7e61586118b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 171fb58da00277b099d5a1c5e114fa57b77c4f90 +refs/heads/master: 586948372189d33ceca9d89fb0c791ef4d53d8ad diff --git a/trunk/drivers/input/tablet/wacom_wac.c b/trunk/drivers/input/tablet/wacom_wac.c index 41b6fbf60112..1daa97913b7d 100644 --- a/trunk/drivers/input/tablet/wacom_wac.c +++ b/trunk/drivers/input/tablet/wacom_wac.c @@ -2017,6 +2017,9 @@ static const struct wacom_features wacom_features_0x100 = static const struct wacom_features wacom_features_0x101 = { "Wacom ISDv4 101", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x10D = + { "Wacom ISDv4 10D", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, + 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x4001 = { "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -2201,6 +2204,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xEF) }, { USB_DEVICE_WACOM(0x100) }, { USB_DEVICE_WACOM(0x101) }, + { USB_DEVICE_WACOM(0x10D) }, { USB_DEVICE_WACOM(0x4001) }, { USB_DEVICE_WACOM(0x47) }, { USB_DEVICE_WACOM(0xF4) },