diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:38:10 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:38:10 +0100 |
| commit | 90c5f4649aafd0bca6f47f67ea0ba596c93a3ab0 (patch) | |
| tree | 3f0190964cc20b62218889cfff2256fae6a68751 /drivers/hid/hid-ids.h | |
| parent | 36ed0958feaffc99214b17f668127bc2cfdcf5b4 (diff) | |
| parent | b92b80246e06269c1407face33fd8a57a763a145 (diff) | |
Merge branch 'for-5.11/asus' into for-linus
Support for ASUS N-Key keyboard, from Luke D Jones
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 787b20d02451..d07413ae255a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -190,6 +190,7 @@ #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 +#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD 0x1866 #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869 #define USB_VENDOR_ID_ATEN 0x0557 |