diff options
| author | Dmitry Torokhov <[email protected]> | 2010-08-03 01:35:17 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2010-08-03 01:35:17 +0000 |
| commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
| tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/hid/hid-core.c | |
| parent | Input: xpad - add product ID for Hori Fighting Stick EX2 (diff) | |
| parent | Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add() (diff) | |
| download | kernel-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.tar.gz kernel-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index aa0f7dcabcd7..a35f8bee9659 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1568,6 +1568,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) }, { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) }, { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) }, { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) }, |