Merge branch 'upstream-fixes' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7f0e40bdb47e..066d219b7f10 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -479,12 +479,15 @@
 
 #define USB_VENDOR_ID_THRUSTMASTER      0x044f
 
-#define USB_VENDOR_ID_TOPMAX            0x0663
-#define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
-
 #define USB_VENDOR_ID_TOPSEED           0x0766
 #define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204
 
+#define USB_VENDOR_ID_TOPSEED2          0x1784
+#define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004
+
+#define USB_VENDOR_ID_TOPMAX            0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
+
 #define USB_VENDOR_ID_TOUCHPACK         0x1bfd
 #define USB_DEVICE_ID_TOUCHPACK_RTS     0x1688
 
@@ -507,7 +510,6 @@
 
 #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