diff options
| author | Linus Torvalds | 2017-11-10 23:14:23 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-10 23:14:23 +0100 |
| commit | 60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8 (patch) | |
| tree | ba67c7bd1f06d58746b94bb729924a148e953a99 /drivers/input/mouse | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3 (diff) | |
| download | kernel-qcow2-linux-60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8.tar.gz kernel-qcow2-linux-60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8.tar.xz kernel-qcow2-linux-60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer updates from Dmitry Torokhov:
- a new ACPI ID for Elan touchpad found in yet another Ideapad model
- Synaptics RMI4 will allow binding to controllers reporting SMB
version 3 (note that we are not adding any new ACPI IDs to the
Synaptics PS/2 drover so unless user explicitly enables intertouch
support there is no user-visible change)
- a fixup to TSC 2004/5 touchscreen driver to mark input devices as
"direct" to help userspace identify the type of device they are
dealing with
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
Input: tsc200x-core - set INPUT_PROP_DIRECT
Input: elan_i2c - add ELAN060C to the ACPI table
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 6d6b092e2da9..d6135900da64 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1258,6 +1258,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0605", 0 }, { "ELAN0609", 0 }, { "ELAN060B", 0 }, + { "ELAN060C", 0 }, { "ELAN0611", 0 }, { "ELAN1000", 0 }, { } |