summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorIHARA Hiroka <ihara_h@live.jp>2017-02-13 05:34:53 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-13 05:36:49 +0300
commit722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (patch)
treec36f7895f446d3f0b5dea3c3ec612a5bce1c03ec /drivers/input
parent413d37326700aaf708730b940b04192c36e13ef4 (diff)
downloadlinux-722c5ac708b4f5c1fcfad5fed4c95234c8b06590.tar.xz
Input: elan_i2c - add ELAN0605 to the ACPI table
ELAN0605 has been confirmed to be a variant of ELAN0600, which is blacklisted in the hid-core to be managed by elan_i2c. This device can be found in Lenovo ideapad 310s (80U4000). Signed-off-by: Hiroka IHARA <ihara_h@live.jp> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 fa598f7f4372..1e1d0ad406f2 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1231,6 +1231,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
{ "ELAN0000", 0 },
{ "ELAN0100", 0 },
{ "ELAN0600", 0 },
+ { "ELAN0605", 0 },
{ "ELAN1000", 0 },
{ }
};