diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:11:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:11:52 +0200 |
| commit | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (patch) | |
| tree | 6a06f6d811781ca81f4cfcf56d71882fd4b041c1 /include/linux/hid.h | |
| parent | d29ed11bb728bbe5175d1e9ff592140150305ab6 (diff) | |
| parent | 39bbf40227bcd37e02f7983b2d06696c10cec43a (diff) | |
| download | lwn-38e50c9ba84ad755247220ce6a881fbdb44aaeec.tar.gz lwn-38e50c9ba84ad755247220ce6a881fbdb44aaeec.zip | |
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 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 1774a7887b9a..26759920aa8f 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -173,6 +173,7 @@ struct hid_item { #define HID_UP_LOGIVENDOR3 0xff430000 #define HID_UP_LNVENDOR 0xffa00000 #define HID_UP_SENSOR 0x00200000 +#define HID_UP_ASUSVENDOR 0xff310000 #define HID_USAGE 0x0000ffff @@ -292,6 +293,7 @@ struct hid_item { #define HID_DG_BARRELSWITCH2 0x000d005a #define HID_DG_TOOLSERIALNUMBER 0x000d005b +#define HID_VD_ASUS_CUSTOM_MEDIA_KEYS 0xff310076 /* * HID report types --- Ouch! HID spec says 1 2 3! */ |