Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

diff --combined drivers/hid/Kconfig
index 434099369058ad42e72d5ba1de85ae2ed6445de9,ecc11405922a4bf3681030d7c4258b4e92700cbb..d51f0144a3b9d1f4dbd95ebc57c278db2e66e9e6
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -148,6 -148,12 +148,12 @@@ config HID_EGALA
        ---help---
        Support for the eGalax dual-touch panel.
  
+ config HID_ELECOM
+       tristate "ELECOM"
+       depends on BT_HIDP
+       ---help---
+       Support for the ELECOM BM084 (bluetooth mouse).
+ 
  config HID_EZKEY
        tristate "Ezkey" if EMBEDDED
        depends on USB_HID
@@@ -347,18 -353,9 +353,18 @@@ config HID_QUANT
        ---help---
        Support for Quanta Optical Touch dual-touch panels.
  
 +config HID_ROCCAT
 +      tristate "Roccat special event support"
 +      depends on USB_HID
 +      ---help---
 +      Support for Roccat special events.
 +      Say Y here if you have a Roccat mouse or keyboard and want OSD or
 +      macro execution support.
 +
  config HID_ROCCAT_KONE
        tristate "Roccat Kone Mouse support"
        depends on USB_HID
 +      select HID_ROCCAT
        ---help---
        Support for Roccat Kone mouse.
  

diff --combined drivers/hid/Makefile
index 987fa062736708ee99ed5181c5c5d26302231a7f,3a6eb7ec42e2103bff4c69f491a64f5f88a8557a..2ec042f57138a030e1d799ff5dbb58edc2fabb2c
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -32,6 -32,7 +32,7 @@@ obj-$(CONFIG_HID_CHICONY)     += hid-chicon
  obj-$(CONFIG_HID_CYPRESS)     += hid-cypress.o
  obj-$(CONFIG_HID_DRAGONRISE)  += hid-drff.o
  obj-$(CONFIG_HID_EGALAX)      += hid-egalax.o
+ obj-$(CONFIG_HID_ELECOM)      += hid-elecom.o
  obj-$(CONFIG_HID_EZKEY)               += hid-ezkey.o
  obj-$(CONFIG_HID_GYRATION)    += hid-gyration.o
  obj-$(CONFIG_HID_KENSINGTON)  += hid-kensington.o
@@@ -48,7 -49,6 +49,7 @@@ obj-$(CONFIG_HID_QUANTA)      += hid-quanta.
  obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)     += hid-picolcd.o
 +obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o
  obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
  obj-$(CONFIG_HID_SAMSUNG)     += hid-samsung.o
  obj-$(CONFIG_HID_SMARTJOYPLUS)        += hid-sjoy.o

diff --combined drivers/hid/hid-core.c
index 866e54ec5fb2eed324a122fda7b05944b36392c0,20bccd4d488afbd2c54b88b333e58bc04eb1b1bd..a204d092e2d75d9df2c7db3d1adebf999463a61a
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1294,6 -1294,7 +1294,7 @@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
@@@ -1301,7 -1302,6 +1302,7 @@@
        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
@@@ -1337,24 -1337,6 +1338,24 @@@
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
@@@ -1778,8 -1760,7 +1779,8 @@@ int hid_add_device(struct hid_device *h
  
        /* we need to kill them here, otherwise they will stay allocated to
         * wait for coming driver */
 -      if (!(hdev->quirks & HID_QUIRK_NO_IGNORE) && hid_ignore(hdev))
 +      if (!(hdev->quirks & HID_QUIRK_NO_IGNORE)
 +            && (hid_ignore(hdev) || (hdev->quirks & HID_QUIRK_IGNORE)))
                return -ENODEV;
  
        /* XXX hack, any other cleaner solution after the driver core

diff --combined drivers/hid/hid-ids.h
index 31601eef25dd660d649bc70b864e4db05340c955,f90ef6e85bc7e94838ce643d0f3ed7fa926707fd..7f0e40bdb47ea16f5de8bb98c879f1fdecdaab99
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -34,7 -34,7 +34,7 @@@
  #define USB_DEVICE_ID_ACECAD_FLAIR    0x0004
  #define USB_DEVICE_ID_ACECAD_302      0x0008
  
- #define USB_VENDOR_ID_ADS_TECH                0x06e1
+ #define USB_VENDOR_ID_ADS_TECH                0x06e1
  #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X   0xa155
  
  #define USB_VENDOR_ID_AFATECH         0x15a4
@@@ -81,12 -81,12 +81,12 @@@
  #define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI   0x0223
  #define USB_DEVICE_ID_APPLE_WELLSPRING_ISO    0x0224
  #define USB_DEVICE_ID_APPLE_WELLSPRING_JIS    0x0225
- #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229
- #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
- #define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI   0x0229
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO    0x022a
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS    0x022b
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO  0x022d
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS  0x022e
  #define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI  0x0230
  #define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO   0x0231
  #define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS   0x0232
@@@ -118,8 -118,8 +118,8 @@@
  #define USB_VENDOR_ID_AVERMEDIA               0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800   0xb800
  
- #define USB_VENDOR_ID_BELKIN           0x050d
- #define USB_DEVICE_ID_FLIP_KVM         0x3201
+ #define USB_VENDOR_ID_BELKIN          0x050d
+ #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
  #define USB_VENDOR_ID_BERKSHIRE               0x0c98
  #define USB_DEVICE_ID_BERKSHIRE_PCWD  0x1140
@@@ -128,13 -128,12 +128,13 @@@
  #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       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
 +#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
  #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE      0x00ff
  #define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK  0x00d3
  
@@@ -175,7 -174,7 +175,7 @@@
  #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701       0x819a
  
  #define USB_VENDOR_ID_DELORME         0x1163
- #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
+ #define USB_DEVICE_ID_DELORME_EARTHMATE       0x0100
  #define USB_DEVICE_ID_DELORME_EM_LT20 0x0200
  
  #define USB_VENDOR_ID_DMI             0x0c0b
@@@ -187,19 -186,22 +187,22 @@@
  #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER  0x0001
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH  0x480d
  
+ #define USB_VENDOR_ID_ELECOM          0x056e
+ #define USB_DEVICE_ID_ELECOM_BM084    0x0061
+ 
  #define USB_VENDOR_ID_ELO             0x04E7
  #define USB_DEVICE_ID_ELO_TS2700      0x0020
  
  #define USB_VENDOR_ID_ESSENTIAL_REALITY       0x0d7f
  #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
  
- #define USB_VENDOR_ID_ETURBOTOUCH     0x22b9
- #define USB_DEVICE_ID_ETURBOTOUCH     0x0006
- 
  #define USB_VENDOR_ID_ETT             0x0664
  #define USB_DEVICE_ID_TC5UH           0x0309
  
- #define USB_VENDOR_ID_EZKEY           0x0518
+ #define USB_VENDOR_ID_ETURBOTOUCH     0x22b9
+ #define USB_DEVICE_ID_ETURBOTOUCH     0x0006
+ 
+ #define USB_VENDOR_ID_EZKEY           0x0518
  #define USB_DEVICE_ID_BTC_8193                0x0002
  
  #define USB_VENDOR_ID_GAMERON         0x0810
@@@ -282,8 -284,7 +285,8 @@@
  
  #define USB_VENDOR_ID_GYRATION                0x0c16
  #define USB_DEVICE_ID_GYRATION_REMOTE 0x0002
 -#define USB_DEVICE_ID_GYRATION_REMOTE_2       0x0003
 +#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
 +#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008
  
  #define USB_VENDOR_ID_HAPP            0x078b
  #define USB_DEVICE_ID_UGCI_DRIVING    0x0010
@@@ -296,9 -297,16 +299,16 @@@
  #define USB_VENDOR_ID_KBGEAR          0x084e
  #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO        0x1001
  
+ #define USB_VENDOR_ID_KENSINGTON      0x047d
+ #define USB_DEVICE_ID_KS_SLIMBLADE    0x2041
+ 
  #define USB_VENDOR_ID_KWORLD          0x1b80
  #define USB_DEVICE_ID_KWORLD_RADIO_FM700      0xd700
  
+ #define USB_VENDOR_ID_KYE             0x0458
+ #define USB_DEVICE_ID_KYE_ERGO_525V   0x0087
+ #define USB_DEVICE_ID_KYE_GPEN_560    0x5003
+ 
  #define USB_VENDOR_ID_LABTEC          0x1020
  #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD        0x0006
  
@@@ -318,9 -326,6 +328,6 @@@
  #define USB_DEVICE_ID_LD_POWERCONTROL 0x2030
  #define USB_DEVICE_ID_LD_MACHINETEST  0x2040
  
- #define USB_VENDOR_ID_KENSINGTON      0x047d
- #define USB_DEVICE_ID_KS_SLIMBLADE    0x2041
- 
  #define USB_VENDOR_ID_LOGITECH                0x046d
  #define USB_DEVICE_ID_LOGITECH_RECEIVER       0xc101
  #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
@@@ -370,48 -375,28 +377,48 @@@
  #define USB_DEVICE_ID_MS_PRESENTER_8K_BT      0x0701
  #define USB_DEVICE_ID_MS_PRESENTER_8K_USB     0x0713
  
 +#define USB_VENDOR_ID_MOJO            0x8282
 +#define USB_DEVICE_ID_RETRO_ADAPTER   0x3201
  
  #define USB_VENDOR_ID_MONTEREY                0x0566
  #define USB_DEVICE_ID_GENIUS_KB29E    0x3004
  
+ #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
+ #define USB_DEVICE_ID_N_S_HARMONY     0xc359
+ 
+ #define USB_VENDOR_ID_NATSU           0x08b7
+ #define USB_DEVICE_ID_NATSU_GAMEPAD   0x0001
+ 
  #define USB_VENDOR_ID_NCR             0x0404
  #define USB_DEVICE_ID_NCR_FIRST               0x0300
  #define USB_DEVICE_ID_NCR_LAST                0x03ff
  
- #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
- #define USB_DEVICE_ID_N_S_HARMONY       0xc359
- 
- #define USB_VENDOR_ID_NATSU             0x08b7
- #define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001
- 
  #define USB_VENDOR_ID_NEC             0x073e
  #define USB_DEVICE_ID_NEC_USB_GAME_PAD        0x0301
  
  #define USB_VENDOR_ID_NEXTWINDOW      0x1926
  #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN  0x0003
  
- #define USB_VENDOR_ID_NTRIG                0x1b96
+ #define USB_VENDOR_ID_NTRIG           0x1b96
  #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2   0x0004
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3   0x0005
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4   0x0006
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5   0x0007
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6   0x0008
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7   0x0009
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8   0x000A
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9   0x000B
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10   0x000C
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11   0x000D
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12   0x000E
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13   0x000F
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14   0x0010
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15   0x0011
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16   0x0012
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17   0x0013
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18   0x0014
  
  #define USB_VENDOR_ID_ONTRAK          0x0a07
  #define USB_DEVICE_ID_ONTRAK_ADU100   0x0064
@@@ -427,7 -412,7 +434,7 @@@
  #define USB_VENDOR_ID_PETALYNX                0x18b1
  #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE  0x0037
  
- #define USB_VENDOR_ID_PHILIPS       0x0471
+ #define USB_VENDOR_ID_PHILIPS         0x0471
  #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617
  
  #define USB_VENDOR_ID_PLAYDOTCOM      0x0b43
@@@ -439,16 -424,16 +446,16 @@@
  #define USB_VENDOR_ID_PRODIGE         0x05af
  #define USB_DEVICE_ID_PRODIGE_CORDLESS        0x3062
  
+ #define USB_VENDOR_ID_QUANTA          0x0408
+ #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH    0x3000
+ #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
+ 
  #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
  
- #define USB_VENDOR_ID_QUANTA          0x0408
- #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH    0x3000
- #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
- 
  #define USB_VENDOR_ID_SAMSUNG         0x0419
  #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE       0x0001
  #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE      0x0600
@@@ -472,20 -457,20 +479,20 @@@
  
  #define USB_VENDOR_ID_THRUSTMASTER    0x044f
  
- #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
  
- #define USB_VENDOR_ID_TWINHAN           0x6253
- #define USB_DEVICE_ID_TWINHAN_IR_REMOTE 0x0100
+ #define USB_VENDOR_ID_TWINHAN         0x6253
+ #define USB_DEVICE_ID_TWINHAN_IR_REMOTE       0x0100
  
  #define USB_VENDOR_ID_UCLOGIC         0x5543
  #define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209   0x0042
@@@ -522,9 -507,5 +529,5 @@@
  #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
- 
  
  #endif