From: Jiri Kosina Date: Wed, 4 Aug 2010 13:27:54 +0000 (+0200) Subject: Merge branch 'upstream-fixes' into for-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9929ffed889b4861b52ba648a44fa4add945c4d1;p=linux-beck.git Merge branch 'upstream-fixes' into for-linus Conflicts: drivers/hid/hid-ids.h --- 9929ffed889b4861b52ba648a44fa4add945c4d1 diff --cc drivers/hid/hid-ids.h index 7f0e40bdb47e,be5a8929dd0c..066d219b7f10 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@ -479,14 -472,17 +479,17 @@@ #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_TOUCHPACK 0x1bfd -#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688 - + #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_TOUCHPACK 0x1bfd +#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688 #define USB_VENDOR_ID_TURBOX 0x062a #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201