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 /drivers/hid/hid-ids.h | |
| 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 '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 c2e9b6d1fd7d..8f3e0a5d5f83 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -415,6 +415,7 @@ #define I2C_DEVICE_ID_HP_SPECTRE_X360_15 0x2817 #define I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG 0x29DF #define I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN 0x2BC8 +#define I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN 0x2C82 #define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN 0x2544 #define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706 #define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN 0x261A |