diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:02:25 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:02:25 +0100 |
| commit | 83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 (patch) | |
| tree | 5e728cf3d7c080b73eeea46e16faa520169f849d /drivers/hid/hid-ids.h | |
| parent | a0933a456ff83a3b5ffa3a1903e0b8de4a56adf5 (diff) | |
| parent | 1477edb4853bd730e3ab37fa9165651c03c2cc05 (diff) | |
| download | linux-83fd5ddc19931d5a5b884c43ee3c9d69c673bc96.tar.bz2 | |
Merge branch 'for-4.14/upstream-fixes' into for-linus
- Wacom: recognize PEN application collection properly, from Jason Gerecke
- RMI: avoid cofusion caused by RMI functions being by mistake called on
non-RMI devices, from Andrew Duggan
- small device-ID-specific quirks/fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index be2e005c3c51..c24ebc413223 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -729,6 +729,9 @@ #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a +#define USB_VENDOR_ID_MCS 0x16d0 +#define USB_DEVICE_ID_MCS_GAMEPADBLOCK 0x0bcc + #define USB_VENDOR_ID_MGE 0x0463 #define USB_DEVICE_ID_MGE_UPS 0xffff #define USB_DEVICE_ID_MGE_UPS1 0x0001 |