diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 09:03:51 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 09:03:51 +0200 |
| commit | fd73788ce6a580f2bd353e0f364d31b6c16dcd12 (patch) | |
| tree | dbeecdd8155a9c1c6be3d85739d3740243907c2e /include/linux/hid.h | |
| parent | 5a94296bc02ac616336da7b5332b86d2ca8827f0 (diff) | |
| parent | bcfa8d14570d85c998a9b706b074ab151b286edf (diff) | |
Merge branch 'for-5.14/core' into for-linus
- device unbinding locking fix from Dmitry Torokhov
- support for programmable buttons (mapping to KEY_MACRO# event codes)
from Thomas Weißschuh
- various other small fixes and code style improvements
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 10e922cee4eb..f05bf96a0d21 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -102,6 +102,7 @@ struct hid_item { #define HID_COLLECTION_PHYSICAL 0 #define HID_COLLECTION_APPLICATION 1 #define HID_COLLECTION_LOGICAL 2 +#define HID_COLLECTION_NAMED_ARRAY 4 /* * HID report descriptor global item tags |