aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKT Liao2017-08-14 22:11:59 -0500
committerGreg Kroah-Hartman2017-08-24 19:02:35 -0500
commitae4743cac8d771a614da982ed51ffd396041c3ec (patch)
tree45a38c309900d368b08fc3051fd39b01d576cc57
parent0dbf7f7811df34f0e6af97b885619780014f81e1 (diff)
downloadkernel-omap-ae4743cac8d771a614da982ed51ffd396041c3ec.tar.gz
kernel-omap-ae4743cac8d771a614da982ed51ffd396041c3ec.tar.xz
kernel-omap-ae4743cac8d771a614da982ed51ffd396041c3ec.zip
Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
commit 76988690402dde2880bfe06ecccf381d48ba8e1c upstream. Add 2 new IDs (ELAN0609 and ELAN060B) to the list of ACPI IDs that should be handled by the driver. Signed-off-by: KT Liao <kt.liao@emc.com.tw> 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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index d5309d0a0482..98d4e515587a 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1236,6 +1236,9 @@ static const struct acpi_device_id elan_acpi_id[] = {
1236 { "ELAN0600", 0 }, 1236 { "ELAN0600", 0 },
1237 { "ELAN0605", 0 }, 1237 { "ELAN0605", 0 },
1238 { "ELAN0608", 0 }, 1238 { "ELAN0608", 0 },
1239 { "ELAN0605", 0 },
1240 { "ELAN0609", 0 },
1241 { "ELAN060B", 0 },
1239 { "ELAN1000", 0 }, 1242 { "ELAN1000", 0 },
1240 { } 1243 { }
1241}; 1244};