diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-26 12:48:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-26 12:48:29 -0700 |
| commit | bab9752480c54b5f483a0f52e53cbdef55a83219 (patch) | |
| tree | 5fd22b796212de801182aa810e0f9aced5de639d /drivers/input/mouse/trackpoint.h | |
| parent | 9716bdb23e1d44276299d3cc90884edbeff00341 (diff) | |
| parent | 4a646580f793d19717f7e034c8d473b509c27d49 (diff) | |
| download | linux-bab9752480c54b5f483a0f52e53cbdef55a83219.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- a tweak to the IBM Trackpoint driver that helps recognizing
trackpoints on never Lenovo Carbons
- a fix to the ALPS driver solving scroll issues on some Dells
- yet another ACPI ID has been added to Elan I2C toucpad driver
- quieted diagnostic message in soc_button_array driver
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - fix two-finger scroll breakage in right side on ALPS touchpad
Input: soc_button_array - silence -ENOENT error on Dell XPS13 9365
Input: trackpoint - add new trackpoint firmware ID
Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310
Diffstat (limited to 'drivers/input/mouse/trackpoint.h')
| -rw-r--r-- | drivers/input/mouse/trackpoint.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h index 5617ed3a7d7a..88055755f82e 100644 --- a/drivers/input/mouse/trackpoint.h +++ b/drivers/input/mouse/trackpoint.h @@ -21,8 +21,9 @@ #define TP_COMMAND 0xE2 /* Commands start with this */ #define TP_READ_ID 0xE1 /* Sent for device identification */ -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */ +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */ /* by the firmware ID */ + /* Firmware ID includes 0x1, 0x2, 0x3 */ /* |