diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:06:22 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:06:22 +0100 |
| commit | 47dd6b019edd9fc17ddc5b8c16690c80266cdbde (patch) | |
| tree | 029654a40f39c4c9ad26a1728e455222200f20f1 /drivers/hid/hid-ids.h | |
| parent | 5cc619db5c34146ee821acd08382b9d78579b52e (diff) | |
| parent | 339ee3fcbdab736adbc30b7a3d675005c61a2a40 (diff) | |
Merge branch 'for-4.15/asus' into for-linus
- Asus laptop fixes (fn keys, backlight), from Mustafa Kuscu and
Maxime Bellengé
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 06697af9e6c1..c9f7c74b3b60 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -185,6 +185,7 @@ #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD 0x0101 #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_VENDOR_ID_ATEN 0x0557 #define USB_DEVICE_ID_ATEN_UC100KM 0x2004 |