diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:21:47 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:21:47 +0200 |
commit | 79b83b05b07a40c67ac7196555d2b0293cdf26e7 (patch) | |
tree | 1de495c526584f83689d9e19788b1134a798f308 /drivers/hid/hid-ids.h | |
parent | c1144d29f405ce1f4e6ede6482beb3d0d09750c6 (diff) | |
parent | 85455dd906d568d5a42d9365938fbf82e932e2b8 (diff) | |
download | linux-79b83b05b07a40c67ac7196555d2b0293cdf26e7.tar.gz linux-79b83b05b07a40c67ac7196555d2b0293cdf26e7.tar.bz2 linux-79b83b05b07a40c67ac7196555d2b0293cdf26e7.zip |
Merge branch 'for-4.18/hid-redragon' into for-linus
Redragon Asura support from Robert Munteanu
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 46f5ecd11bf7..be08f988f5e4 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -615,6 +615,7 @@ #define USB_VENDOR_ID_JESS 0x0c45 #define USB_DEVICE_ID_JESS_YUREX 0x1010 #define USB_DEVICE_ID_ASUS_MD_5112 0x5112 +#define USB_DEVICE_ID_REDRAGON_ASURA 0x760b #define USB_VENDOR_ID_JESS2 0x0f30 #define USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD 0x0111 |