diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:09:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:09:31 -0400 |
| commit | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch) | |
| tree | 42f625d04b9fbff4cb93968f18efd91601df15a5 /drivers/hid/hid-ids.h | |
| parent | ef77ad5e67447b3744574c29b97da6677d6d3f18 (diff) | |
| parent | ba4d8abb31def963f49b7c239a8acce57fe1d1cc (diff) | |
Merge branch 'cando' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d55b81d2d16e..7f4b94fbd7ce 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -127,6 +127,10 @@ | |||
| 127 | #define USB_VENDOR_ID_BTC 0x046e | 127 | #define USB_VENDOR_ID_BTC 0x046e |
| 128 | #define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578 | 128 | #define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578 |
| 129 | 129 | ||
| 130 | #define USB_VENDOR_ID_CANDO 0x2087 | ||
| 131 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 | ||
| 132 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 | ||
| 133 | |||
| 130 | #define USB_VENDOR_ID_CH 0x068e | 134 | #define USB_VENDOR_ID_CH 0x068e |
| 131 | #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 | 135 | #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 |
| 132 | #define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 | 136 | #define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 |