From 568d5d1b68761018ba8121ab379ac507e1214aa8 Mon Sep 17 00:00:00 2001
From: Alex Neblett <alexneblett01@yahoo.com>
Date: Tue, 2 Feb 2010 21:16:03 -0800
Subject: [PATCH] --- yaml --- r: 180841 b: refs/heads/master c:
 f54405db66fbec11679241daefd16fd8291a5762 h: refs/heads/master i:   180839:
 f31f854b86a93424438ff290de57d2b15acb948a v: v3

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

diff --git a/[refs] b/[refs]
index d3b08a721a39..a413f473d31e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1a0bdd8022317e98650e70850de73eccfcde5ad
+refs/heads/master: f54405db66fbec11679241daefd16fd8291a5762
diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c
index 2dd9b28e39c4..282f4a1e7214 100644
--- a/trunk/drivers/hid/hid-core.c
+++ b/trunk/drivers/hid/hid-core.c
@@ -1343,6 +1343,7 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h
index 39ff98a5bd61..b29d9da799f4 100644
--- a/trunk/drivers/hid/hid-ids.h
+++ b/trunk/drivers/hid/hid-ids.h
@@ -400,6 +400,7 @@
 
 #define USB_VENDOR_ID_QUANTA		0x0408
 #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH	0x3000
+#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN	0x3001
 
 #define USB_VENDOR_ID_SAMSUNG		0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
diff --git a/trunk/drivers/hid/hid-quanta.c b/trunk/drivers/hid/hid-quanta.c
index 244d61c18a47..9ac49287b943 100644
--- a/trunk/drivers/hid/hid-quanta.c
+++ b/trunk/drivers/hid/hid-quanta.c
@@ -224,6 +224,8 @@ static void quanta_remove(struct hid_device *hdev)
 static const struct hid_device_id quanta_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
 			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
+			USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, quanta_devices);