summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorIHARA Hiroka <ihara_h@live.jp>2017-02-12 18:34:53 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-23 17:43:09 +0100
commitc6cbae45a57f20764b84d7bf10c65e0b3c84efcc (patch)
tree771333f7c9afdefde1d757ba3a544e4cdd9c845a /drivers
parent65de8bfbbe20cf53871852c3c57162ac4d87d6c8 (diff)
Input: elan_i2c - add ELAN0605 to the ACPI table
commit 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 upstream. 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> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 d15b33813021..ed1935f300a7 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1232,6 +1232,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
{ "ELAN0000", 0 },
{ "ELAN0100", 0 },
{ "ELAN0600", 0 },
+ { "ELAN0605", 0 },
{ "ELAN1000", 0 },
{ }
};