From 62e1a3a41881bbbb8619e390a55c9b906a413197 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 20 Oct 2008 12:37:43 +0200 Subject: [PATCH] --- yaml --- r: 117851 b: refs/heads/master c: ac2d98998c32fcdc8d8919b7a4536a7945fd0422 h: refs/heads/master i: 117849: baec6ae101ee6908f4357c5f95959d1c52e1454c 117847: ea5bbb9d1924c7bd6000a45412e008932c6655b5 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 1 + trunk/drivers/hid/hid-ids.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b4eb3178fdd4..5d7ed24a2ab1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 550cb3c3c1fa48171c6358b8641bd01119f5386f +refs/heads/master: ac2d98998c32fcdc8d8919b7a4536a7945fd0422 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 131adb3ea17e..ec5f470ff86a 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1405,6 +1405,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) }, { HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)}, + { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2)}, { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) }, { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) }, diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index 1b2a83418e33..1635ccd877d7 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -89,6 +89,7 @@ #define USB_VENDOR_ID_ASUS 0x0b05 #define USB_DEVICE_ID_ASUS_LCM 0x1726 +#define USB_DEVICE_ID_ASUS_LCM2 0x175b #define USB_VENDOR_ID_ATEN 0x0557 #define USB_DEVICE_ID_ATEN_UC100KM 0x2004