diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-04-26 23:54:24 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-04-26 23:54:24 +0300 |
| commit | 63f7cf66592907e17073c14f6a24c366b1f68db5 (patch) | |
| tree | d4e37530584d33132777dd970cc2379c431df854 /include | |
| parent | 5f86a084a4127458563a845459d08770f3a59465 (diff) | |
| parent | 35903009dbde804a1565dc89e431c0f15179f054 (diff) | |
| download | linux-63f7cf66592907e17073c14f6a24c366b1f68db5.tar.xz | |
Merge branch 'for-6.4/core' into for-linus
- improve handling of generic "Digitizer" usage (Jason Gerecke)
- support for KEY_CAMERA_FOCUS (Feng Qi)
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 1ea8c7a3570b..4e4c4fe36911 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -156,6 +156,7 @@ struct hid_item { #define HID_UP_DIGITIZER 0x000d0000 #define HID_UP_PID 0x000f0000 #define HID_UP_BATTERY 0x00850000 +#define HID_UP_CAMERA 0x00900000 #define HID_UP_HPVENDOR 0xff7f0000 #define HID_UP_HPVENDOR2 0xff010000 #define HID_UP_MSVENDOR 0xff000000 @@ -873,7 +874,7 @@ extern bool hid_is_usb(const struct hid_device *hdev); /* We ignore a few input applications that are not widely used */ #define IS_INPUT_APPLICATION(a) \ (((a >= HID_UP_GENDESK) && (a <= HID_GD_MULTIAXIS)) \ - || ((a >= HID_DG_PEN) && (a <= HID_DG_WHITEBOARD)) \ + || ((a >= HID_DG_DIGITIZER) && (a <= HID_DG_WHITEBOARD)) \ || (a == HID_GD_SYSTEM_CONTROL) || (a == HID_CP_CONSUMER_CONTROL) \ || (a == HID_GD_WIRELESS_RADIO_CTLS)) |