1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 09d27649a0f7..9776896cc4fc 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -20,6 +20,7 @@
 
 #define USB_VENDOR_ID_3M                0x0596
 #define USB_DEVICE_ID_3M1968            0x0500
+#define USB_DEVICE_ID_3M2256            0x0502
 
 #define USB_VENDOR_ID_A4TECH            0x09da
 #define USB_DEVICE_ID_A4TECH_WCP32PU    0x0006
@@ -123,6 +124,13 @@
 #define USB_VENDOR_ID_BERKSHIRE         0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
 
+#define USB_VENDOR_ID_BTC               0x046e
+#define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578
+
+#define USB_VENDOR_ID_CANDO             0x2087
+#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
+#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
+
 #define USB_VENDOR_ID_CH                0x068e
 #define USB_DEVICE_ID_CH_PRO_PEDALS     0x00f2
 #define USB_DEVICE_ID_CH_COMBATSTICK    0x00f4
@@ -148,6 +156,9 @@
 #define USB_DEVICE_ID_CODEMERCS_IOW_FIRST       0x1500
 #define USB_DEVICE_ID_CODEMERCS_IOW_LAST        0x15ff
 
+#define USB_VENDOR_ID_CREATIVELABS      0x041e
+#define USB_DEVICE_ID_PRODIKEYS_PCMIDI  0x2801
+
 #define USB_VENDOR_ID_CYGNAL            0x10c4
 #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X       0x818a
 
@@ -171,6 +182,10 @@
 
 #define USB_VENDOR_ID_DRAGONRISE        0x0079
 
+#define USB_VENDOR_ID_DWAV              0x0eef
+#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH    0x480d
+
 #define USB_VENDOR_ID_ELO               0x04E7
 #define USB_DEVICE_ID_ELO_TS2700        0x0020
 
@@ -342,6 +357,8 @@
 #define USB_VENDOR_ID_MICROCHIP         0x04d8
 #define USB_DEVICE_ID_PICKIT1           0x0032
 #define USB_DEVICE_ID_PICKIT2           0x0033
+#define USB_DEVICE_ID_PICOLCD           0xc002
+#define USB_DEVICE_ID_PICOLCD_BOOTLOADER        0xf002
 
 #define USB_VENDOR_ID_MICROSOFT         0x045e
 #define USB_DEVICE_ID_SIDEWINDER_GV     0x003b
@@ -400,6 +417,9 @@
 #define USB_VENDOR_ID_PRODIGE           0x05af
 #define USB_DEVICE_ID_PRODIGE_CORDLESS  0x3062
 
+#define USB_VENDOR_ID_ROCCAT            0x1e7d
+#define USB_DEVICE_ID_ROCCAT_KONE       0x2ced
+
 #define USB_VENDOR_ID_SAITEK            0x06a3
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
 
@@ -409,6 +429,7 @@
 
 #define USB_VENDOR_ID_SAMSUNG           0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
+#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE        0x0600
 
 #define USB_VENDOR_ID_SONY                      0x054c
 #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE       0x024b
@@ -457,6 +478,7 @@
 
 #define USB_VENDOR_ID_WACOM             0x056a
 #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH  0x81
+#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH   0xbd
 
 #define USB_VENDOR_ID_WISEGROUP         0x0925
 #define USB_DEVICE_ID_SMARTJOY_PLUS     0x0005
@@ -475,6 +497,9 @@
 
 #define USB_VENDOR_ID_ZEROPLUS          0x0c12
 
+#define USB_VENDOR_ID_ZYDACRON  0x13EC
+#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL   0x0006
+
 #define USB_VENDOR_ID_KYE               0x0458
 #define USB_DEVICE_ID_KYE_ERGO_525V     0x0087
 #define USB_DEVICE_ID_KYE_GPEN_560      0x5003