summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-03 03:35:17 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-03 03:35:17 +0200
commitd01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch)
tree90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/hid/hid-ids.h
parentInput: xpad - add product ID for Hori Fighting Stick EX2 (diff)
parentInput: adp5588-keypad - fix NULL dereference in adp5588_gpio_add() (diff)
downloadlinux-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.tar.xz
linux-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6af77ed0b555..fad4cb03a8f2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -197,6 +197,7 @@
#define USB_VENDOR_ID_ETT 0x0664
#define USB_DEVICE_ID_TC5UH 0x0309
+#define USB_DEVICE_ID_TC4UM 0x0306
#define USB_VENDOR_ID_EZKEY 0x0518
#define USB_DEVICE_ID_BTC_8193 0x0002