Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / drivers / hid / hid-ids.h

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4ed9a4f..6cfb5ca 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -64,6 +64,9 @@
 #define USB_VENDOR_ID_AKAI             0x2011
 #define USB_DEVICE_ID_AKAI_MPKMINI2    0x0715
 
+#define USB_VENDOR_ID_AKAI_09E8                0x09E8
+#define USB_DEVICE_ID_AKAI_09E8_MIDIMIX        0x0031
+
 #define USB_VENDOR_ID_ALCOR            0x058f
 #define USB_DEVICE_ID_ALCOR_USBRS232   0x9720
 
@@ -268,6 +271,7 @@
 #define USB_DEVICE_ID_CORSAIR_K95RGB    0x1b11
 #define USB_DEVICE_ID_CORSAIR_M65RGB    0x1b12
 #define USB_DEVICE_ID_CORSAIR_K70RGB    0x1b13
+#define USB_DEVICE_ID_CORSAIR_STRAFE    0x1b15
 #define USB_DEVICE_ID_CORSAIR_K65RGB    0x1b17
 
 #define USB_VENDOR_ID_CREATIVELABS     0x041e
@@ -565,7 +569,7 @@
 #define USB_DEVICE_ID_KYE_GPEN_560     0x5003
 #define USB_DEVICE_ID_KYE_EASYPEN_I405X        0x5010
 #define USB_DEVICE_ID_KYE_MOUSEPEN_I608X       0x5011
-#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2     0x501a
+#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2    0x501a
 #define USB_DEVICE_ID_KYE_EASYPEN_M610X        0x5013
 #define USB_DEVICE_ID_KYE_PENSKETCH_M912       0x5015
 
@@ -713,6 +717,7 @@
 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3    0x07dc
 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2  0x07e2
 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9
 #define USB_DEVICE_ID_MS_TYPE_COVER_3    0x07de
 #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
 
@@ -859,6 +864,7 @@
 #define USB_DEVICE_ID_SAITEK_PS1000    0x0621
 #define USB_DEVICE_ID_SAITEK_RAT7_OLD  0x0ccb
 #define USB_DEVICE_ID_SAITEK_RAT7      0x0cd7
+#define USB_DEVICE_ID_SAITEK_RAT9      0x0cfa
 #define USB_DEVICE_ID_SAITEK_MMO7      0x0cd0
 
 #define USB_VENDOR_ID_SAMSUNG          0x0419
@@ -996,6 +1002,10 @@
 #define USB_DEVICE_ID_UCLOGIC_TABLET_WP1062    0x0064
 #define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850  0x0522
 #define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60    0x0781
+#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3     0x3031
+#define USB_DEVICE_ID_UGEE_TABLET_81           0x0081
+#define USB_DEVICE_ID_UGEE_TABLET_45           0x0045
+#define USB_DEVICE_ID_YIYNOVA_TABLET           0x004d
 
 #define USB_VENDOR_ID_UNITEC   0x227d
 #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709    0x0709
@@ -1085,4 +1095,7 @@
 #define USB_DEVICE_ID_RAPHNET_2NES2SNES        0x0002
 #define USB_DEVICE_ID_RAPHNET_4NES4SNES        0x0003
 
+#define USB_VENDOR_ID_UGTIZER                  0x2179
+#define USB_DEVICE_ID_UGTIZER_TABLET_GP0610    0x0053
+
 #endif