---

yaml
---
r: 25731
b: refs/heads/master
c: 1d3e202
h: refs/heads/master
i:
  25729: 83c5dcb
  25727: a3c4671
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a13db346bb6ef80c112d373733d3e873dad90b
+refs/heads/master: 1d3e20236d7a5678d44602171bbd153c57c8c4bc

trunk/drivers/usb/input/Kconfig

@@ -200,9 +200,45 @@ config USB_POWERMATE
 	  To compile this driver as a module, choose M here: the
 	  module will be called powermate.
 
+config USB_TOUCHSCREEN
+	tristate "USB Touchscreen Driver"
+	depends on USB && INPUT
+	---help---
+	  USB Touchscreen driver for:
+	  - eGalax Touchkit USB
+	  - PanJit TouchSet USB
+	  - 3M MicroTouch USB
+	  - ITM
+
+	  Have a look at <http://linux.chapter7.ch/touchkit/> for
+	  a usage description and the required user-space stuff.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called usbtouchscreen.
+
+config USB_TOUCHSCREEN_EGALAX
+	default y
+	bool "eGalax device support" if EMBEDDED
+	depends on USB_TOUCHSCREEN
+
+config USB_TOUCHSCREEN_PANJIT
+	default y
+	bool "PanJit device support" if EMBEDDED
+	depends on USB_TOUCHSCREEN
+
+config USB_TOUCHSCREEN_3M
+	default y
+	bool "3M/Microtouch device support" if EMBEDDED
+	depends on USB_TOUCHSCREEN
+
+config USB_TOUCHSCREEN_ITM
+	default y
+	bool "ITM device support" if EMBEDDED
+	depends on USB_TOUCHSCREEN
+
 config USB_MTOUCH
 	tristate "MicroTouch USB Touchscreen Driver"
-	depends on USB && INPUT
+	depends on USB && INPUT && !USB_TOUCHSCREEN_3M
 	---help---
 	  Say Y here if you want to use a MicroTouch (Now 3M) USB 
 	  Touchscreen controller.
@@ -214,7 +250,7 @@ config USB_MTOUCH
 
 config USB_ITMTOUCH
 	tristate "ITM Touch USB Touchscreen Driver"
-	depends on USB && INPUT
+	depends on USB && INPUT && !USB_TOUCHSCREEN_ITM
 	---help---
 	  Say Y here if you want to use a ITM Touch USB
 	  Touchscreen controller.
@@ -226,7 +262,7 @@ config USB_ITMTOUCH
 
 config USB_EGALAX
 	tristate "eGalax TouchKit USB Touchscreen Driver"
-	depends on USB && INPUT
+	depends on USB && INPUT && !USB_TOUCHSCREEN_EGALAX
 	---help---
 	  Say Y here if you want to use a eGalax TouchKit USB
 	  Touchscreen controller.

trunk/drivers/usb/input/Makefile

@@ -37,6 +37,7 @@ obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 obj-$(CONFIG_USB_MTOUCH)	+= mtouchusb.o
 obj-$(CONFIG_USB_ITMTOUCH)	+= itmtouch.o
 obj-$(CONFIG_USB_EGALAX)	+= touchkitusb.o
+obj-$(CONFIG_USB_TOUCHSCREEN)	+= usbtouchscreen.o
 obj-$(CONFIG_USB_POWERMATE)	+= powermate.o
 obj-$(CONFIG_USB_WACOM)		+= wacom.o
 obj-$(CONFIG_USB_ACECAD)	+= acecad.o

trunk/drivers/usb/input/hid-core.c

@@ -1372,6 +1372,8 @@ void hid_close(struct hid_device *hid)
 		usb_kill_urb(hid->urbin);
 }
 
+#define USB_VENDOR_ID_PANJIT		0x134c
+
 /*
  * Initialize all reports
  */
@@ -1701,6 +1703,11 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
 	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
 
+	{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
+
 	{ 0, 0 }
 };