aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai-Heng Feng2017-08-14 22:11:26 -0500
committerGreg Kroah-Hartman2017-08-24 19:02:35 -0500
commit0dbf7f7811df34f0e6af97b885619780014f81e1 (patch)
treeb25c0862d774d228d8f384a2822890e7dd19a80a
parent4362533a04680de13acd3e6f5a16c3d81502f589 (diff)
downloadkernel-omap-0dbf7f7811df34f0e6af97b885619780014f81e1.tar.gz
kernel-omap-0dbf7f7811df34f0e6af97b885619780014f81e1.tar.xz
kernel-omap-0dbf7f7811df34f0e6af97b885619780014f81e1.zip
Input: elan_i2c - add ELAN0608 to the ACPI table
commit 1874064eed0502bd9bef7be8023757b0c4f26883 upstream. Similar to commit 722c5ac708b4f ("Input: elan_i2c - add ELAN0605 to the ACPI table"), ELAN0608 should be handled by elan_i2c. This touchpad can be found in Lenovo ideapad 320-14IKB. BugLink: https://bugs.launchpad.net/bugs/1708852 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>
-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 da5458dfb1e3..d5309d0a0482 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1235,6 +1235,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
1235 { "ELAN0100", 0 }, 1235 { "ELAN0100", 0 },
1236 { "ELAN0600", 0 }, 1236 { "ELAN0600", 0 },
1237 { "ELAN0605", 0 }, 1237 { "ELAN0605", 0 },
1238 { "ELAN0608", 0 },
1238 { "ELAN1000", 0 }, 1239 { "ELAN1000", 0 },
1239 { } 1240 { }
1240}; 1241};