diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:11:52 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:11:52 +0300 |
| commit | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (patch) | |
| tree | 6a06f6d811781ca81f4cfcf56d71882fd4b041c1 /drivers/hid/hid-ids.h | |
| parent | d29ed11bb728bbe5175d1e9ff592140150305ab6 (diff) | |
| parent | 39bbf40227bcd37e02f7983b2d06696c10cec43a (diff) | |
| download | linux-38e50c9ba84ad755247220ce6a881fbdb44aaeec.tar.xz | |
Merge branch 'for-4.14/multitouch' into for-linus
- support for media keys on Asus T304UA from João Paulo Rechi Vita
- support for Microsoft Win8 Wireless Radio Controls extensions
from João Paulo Rechi Vita
Conflicts:
drivers/hid/hid-ids.h
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
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 40d56b42c83b..b397a14ab970 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -177,6 +177,7 @@ #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b #define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0 #define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502 +#define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585 #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD 0x0101 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 |