diff options
| author | Linus Torvalds | 2019-08-20 20:18:43 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-08-20 20:18:43 +0200 |
| commit | 15d90b242290f228166ea79ee1cc2db6b31a2143 (patch) | |
| tree | 39744874c11202c9e0dd9777caddf7e55a1b6460 /drivers/hid/intel-ish-hid/ipc/hw-ish.h | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | HID: wacom: correct misreported EKR ring values (diff) | |
| download | kernel-qcow2-linux-15d90b242290f228166ea79ee1cc2db6b31a2143.tar.gz kernel-qcow2-linux-15d90b242290f228166ea79ee1cc2db6b31a2143.tar.xz kernel-qcow2-linux-15d90b242290f228166ea79ee1cc2db6b31a2143.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID fixes from Jiri Kosina:
- a few regression fixes for wacom driver (including fix for my earlier
mismerge) from Aaron Armstrong Skomra and Jason Gerecke
- revert of a few Logitech device ID additions which turn out to not
work perfectly with the hidpp driver at the moment; proper support is
now scheduled for 5.4. Fixes from Benjamin Tissoires
- scheduling-in-atomic fix for cp2112 driver, from Benjamin Tissoires
- new device ID to intel-ish, from Even Xu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: wacom: correct misreported EKR ring values
HID: cp2112: prevent sleeping function called from invalid context
HID: intel-ish-hid: ipc: add EHL device id
HID: wacom: Correct distance scale for 2nd-gen Intuos devices
HID: logitech-hidpp: remove support for the G700 over USB
Revert "HID: logitech-hidpp: add USB PID for a few more supported mice"
HID: wacom: add back changes dropped in merge commit
Diffstat (limited to 'drivers/hid/intel-ish-hid/ipc/hw-ish.h')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h index 1065692f90e2..5792a104000a 100644 --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h @@ -24,6 +24,7 @@ #define ICL_MOBILE_DEVICE_ID 0x34FC #define SPT_H_DEVICE_ID 0xA135 #define CML_LP_DEVICE_ID 0x02FC +#define EHL_Ax_DEVICE_ID 0x4BB3 #define REVISION_ID_CHT_A0 0x6 #define REVISION_ID_CHT_Ax_SI 0x0 |