summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorKai-Heng Feng <kai.heng.feng@canonical.com>2017-11-07 16:19:24 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-15 17:13:13 +0100
commit05b690ccb077eccb6a1aeb610456dbd5ea7f04a1 (patch)
tree9e563d33c3a099e294d741d4fce3c491a4298088 /drivers/input
parent4694272c470ac7a2ec36e23442369ac5f135faee (diff)
downloadlinux-stable-05b690ccb077eccb6a1aeb610456dbd5ea7f04a1.tar.gz
linux-stable-05b690ccb077eccb6a1aeb610456dbd5ea7f04a1.tar.bz2
linux-stable-05b690ccb077eccb6a1aeb610456dbd5ea7f04a1.zip
Input: elan_i2c - add ELAN060C to the ACPI table
commit cdea6a30c2689cc33b34c6691b57cca277f0c5dc upstream. ELAN060C touchpad uses elan_i2c as its driver. It can be found on Lenovo ideapad 320-14AST. BugLink: https://bugs.launchpad.net/bugs/1727544 Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/elan_i2c_core.c1
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 b8c50d883b2c..c9d491bc85e0 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1240,6 +1240,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
{ "ELAN0605", 0 },
{ "ELAN0609", 0 },
{ "ELAN060B", 0 },
+ { "ELAN060C", 0 },
{ "ELAN0611", 0 },
{ "ELAN1000", 0 },
{ }