From f6029c710d214bca2fc581ceac830934cfba7583 Mon Sep 17 00:00:00 2001
From: ice chien <ice.chien@accupoint.com.tw>
Date: Fri, 15 Jul 2011 16:58:06 +0800
Subject: [PATCH] --- yaml --- r: 256815 b: refs/heads/master c:
 bc8a2a9b4e5c418bebaa6bb812982b7ecd298821 h: refs/heads/master i:   256813:
 f3dbff0cbb36763fa31d0fbf5eefcf9664df0461   256811:
 1f9487f2ba21c8f4529c8a2bc533073a1b903107   256807:
 31861fa8ec23e8a2ddc71004ff42ed6c867ff5f7   256799:
 5ca9bcc98739b086c2d1f3be7da8ee6db9a3f169 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/hid/Kconfig          | 1 +
 trunk/drivers/hid/hid-core.c       | 1 +
 trunk/drivers/hid/hid-ids.h        | 3 +++
 trunk/drivers/hid/hid-multitouch.c | 4 ++++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ef28a9556b3..49a0d747825c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6b8f5819f56ab79741871a4bd8a6e9f9d127bd6
+refs/heads/master: bc8a2a9b4e5c418bebaa6bb812982b7ecd298821
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index acc39e8ef3e7..6008e634853e 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -335,6 +335,7 @@ config HID_MULTITOUCH
 	  - Stantum multitouch panels
 	  - Touch International Panels
 	  - Unitec Panels
+	  - XAT optical touch panels
 
 	  If unsure, say N.
 
diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c
index 2a268fc4db9a..1ae647e3e81c 100644
--- a/trunk/drivers/hid/hid-core.c
+++ b/trunk/drivers/hid/hid-core.c
@@ -1500,6 +1500,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h
index 2c8594767191..f9717e2a95a2 100644
--- a/trunk/drivers/hid/hid-ids.h
+++ b/trunk/drivers/hid/hid-ids.h
@@ -667,6 +667,9 @@
 #define USB_VENDOR_ID_X_TENSIONS               0x1ae7
 #define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE    0x9001
 
+#define USB_VENDOR_ID_XAT	0x2505
+#define USB_DEVICE_ID_XAT_CSR	0x0220
+
 #define USB_VENDOR_ID_YEALINK		0x6993
 #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001
 
diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c
index ecd4d2db9e80..c0d1b15ca67c 100644
--- a/trunk/drivers/hid/hid-multitouch.c
+++ b/trunk/drivers/hid/hid-multitouch.c
@@ -699,6 +699,10 @@ static const struct hid_device_id mt_devices[] = {
 	{ .driver_data = MT_CLS_DEFAULT,
 		HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
 			USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
+	/* XAT */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_XAT,
+			USB_DEVICE_ID_XAT_CSR) },
 
 	{ }
 };