From 4300042f19bd86dcc085a36210445138ec7eadec Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 4 Sep 2012 10:41:02 -0400 Subject: [PATCH] --- yaml --- r: 322699 b: refs/heads/master c: 92fc7a8b0f20bdb243c706daf42658e8e0cd2ef0 h: refs/heads/master i: 322697: 7ba4fe1e46b92babef3885739facf466a1632f32 322695: d1a38e477ecb5081cba2b2340707cb5bd8f21d1e v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/quirks.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2a83e50fd3c8..e72245e99fca 100644 --- 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 index f15501f4c585..e77a8e8eaa23 100644 --- 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 },