From 0be7cf4c51f65a11b4128703ab3c0dc429e984e3 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
Date: Tue, 21 Aug 2012 22:11:59 -0700
Subject: [PATCH] --- yaml --- r: 322559 b: refs/heads/master c:
 6f4d0382e2a6d27045e223d8c452659477826650 h: refs/heads/master i:   322557:
 522f23d94b2799da156c5e83a40ddd9551a9136b   322555:
 32267073e3c1ed2217b22319943bd8c730ab1b56   322551:
 cb79fc4fbb327b3a324b56ffe5ad799e8413d0a5   322543:
 67e1eb85f88360916d01d8cef82c7433a336f024   322527:
 3dbd50b8e147e78fd7513b4322d9e0f784abc9a5   322495:
 8c7009efba8e31d22da3b06ac9b8234fda7549eb   322431:
 737755d7a0d2ef98be08f4888afb4960013ea2a0   322303:
 4cea2335f8be42e6396631b2f6f32b43aa2afd83   322047:
 27b0e523df4658ba9565de27ac71978c0533e2b2   321535:
 695fbece37b82e09342dc3d0411b86d5532742a0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/input/tablet/wacom_wac.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4773b785d84..1c09ec75f020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b125b94ca16b7e618c6241cb02c4c8060cea5e3
+refs/heads/master: 6f4d0382e2a6d27045e223d8c452659477826650
diff --git a/trunk/drivers/input/tablet/wacom_wac.c b/trunk/drivers/input/tablet/wacom_wac.c
index 002041975de9..532d067a9e07 100644
--- a/trunk/drivers/input/tablet/wacom_wac.c
+++ b/trunk/drivers/input/tablet/wacom_wac.c
@@ -1848,7 +1848,10 @@ static const struct wacom_features wacom_features_0x2A =
 	{ "Wacom Intuos5 M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
 	  63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xF4 =
-	{ "Wacom Cintiq 24HD",    WACOM_PKGLEN_INTUOS,   104480, 65600, 2047,
+	{ "Wacom Cintiq 24HD",       WACOM_PKGLEN_INTUOS,   104480, 65600, 2047,
+	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+static const struct wacom_features wacom_features_0xF8 =
+	{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS,   104480, 65600, 2047,
 	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x3F =
 	{ "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023,
@@ -2091,6 +2094,7 @@ const struct usb_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0xEF) },
 	{ USB_DEVICE_WACOM(0x47) },
 	{ USB_DEVICE_WACOM(0xF4) },
+	{ USB_DEVICE_WACOM(0xF8) },
 	{ USB_DEVICE_WACOM(0xFA) },
 	{ USB_DEVICE_LENOVO(0x6004) },
 	{ }