diff options
| author | Jiri Kosina | 2016-05-17 12:41:22 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2016-05-17 12:41:22 +0200 |
| commit | 3390e579b3dac71e630ed879a73c5ac3b4447045 (patch) | |
| tree | fcd7f4118654286c1e634c87e4ad3efcea3c637d /drivers/hid/hid-ids.h | |
| parent | Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and... (diff) | |
| parent | HID: usbhid: quirks for Corsair RGB keyboard & mice (K70R, K95RGB, M65RGB, K7... (diff) | |
| download | kernel-qcow2-linux-3390e579b3dac71e630ed879a73c5ac3b4447045.tar.gz kernel-qcow2-linux-3390e579b3dac71e630ed879a73c5ac3b4447045.tar.xz kernel-qcow2-linux-3390e579b3dac71e630ed879a73c5ac3b4447045.zip | |
Merge branch 'for-4.7/upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index e550a3a2b06d..3eec09a134cb 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -259,6 +259,13 @@ #define USB_VENDOR_ID_CORSAIR 0x1b1c #define USB_DEVICE_ID_CORSAIR_K90 0x1b02 +#define USB_VENDOR_ID_CORSAIR 0x1b1c +#define USB_DEVICE_ID_CORSAIR_K70R 0x1b09 +#define USB_DEVICE_ID_CORSAIR_K95RGB 0x1b11 +#define USB_DEVICE_ID_CORSAIR_M65RGB 0x1b12 +#define USB_DEVICE_ID_CORSAIR_K70RGB 0x1b13 +#define USB_DEVICE_ID_CORSAIR_K65RGB 0x1b17 + #define USB_VENDOR_ID_CREATIVELABS 0x041e #define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51 0x322c #define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801 |