---

yaml --- r: 322699 b: refs/heads/master c: 92fc7a8 h: refs/heads/master i: 322697: 7ba4fe1 322695: d1a38e4 v: v3
git-mirror · Sep 5, 2012 · 4300042 · 4300042
1 parent 1c4dd17
commit 4300042
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fffb77c8393151b0cf8cef1b9c2ba90587dd2e8
+refs/heads/master: 92fc7a8b0f20bdb243c706daf42658e8e0cd2ef0
diff --git a/trunk/drivers/usb/core/quirks.c b/trunk/drivers/usb/core/quirks.c
@@ -71,6 +71,10 @@ static const struct usb_device_id usb_quirk_list[] = {
 	{ USB_DEVICE(0x04b4, 0x0526), .driver_info =
 			USB_QUIRK_CONFIG_INTF_STRINGS },
 
+	/* Microchip Joss Optical infrared touchboard device */
+	{ USB_DEVICE(0x04d8, 0x000c), .driver_info =
+			USB_QUIRK_CONFIG_INTF_STRINGS },
+
 	/* Samsung Android phone modem - ID conflict with SPH-I500 */
 	{ USB_DEVICE(0x04e8, 0x6601), .driver_info =
 			USB_QUIRK_CONFIG_INTF_STRINGS },