aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Wienke <languitar@semipol.de>2018-06-04 13:37:26 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-04 13:41:49 -0700
commite6e7e9cd8eed0e18217c899843bffbe8c7dae564 (patch)
treef851f326000cedda9d795613abe2354a5809cec4 /drivers
parentMerge branch 'next' into for-linus (diff)
downloadlinux-dev-e6e7e9cd8eed0e18217c899843bffbe8c7dae564.tar.xz
linux-dev-e6e7e9cd8eed0e18217c899843bffbe8c7dae564.zip
Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
Add ELAN0612 to the list of supported touchpads; this ID is used in Lenovo v330 14IKB devices. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199253 Signed-off-by: Johannes Wienke <languitar@semipol.de> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-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 2690a4b7ed53..8ff75114e762 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1344,6 +1344,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
{ "ELAN060B", 0 },
{ "ELAN060C", 0 },
{ "ELAN0611", 0 },
+ { "ELAN0612", 0 },
{ "ELAN1000", 0 },
{ }
};