diff options
| author | IHARA Hiroka <ihara_h@live.jp> | 2017-02-12 21:34:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-23 11:44:35 -0500 |
| commit | 19d2d869d00e37004e6c49ed0384167f701b3bdd (patch) | |
| tree | 891fe6334ef7ab059bec3b8289ce203c5acb1109 /drivers/input | |
| parent | a975e8e81e5533786b2120d053203b47e07d6c1d (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/input')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 1 |
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[] = { | |||
| 1232 | { "ELAN0000", 0 }, | 1232 | { "ELAN0000", 0 }, |
| 1233 | { "ELAN0100", 0 }, | 1233 | { "ELAN0100", 0 }, |
| 1234 | { "ELAN0600", 0 }, | 1234 | { "ELAN0600", 0 }, |
| 1235 | { "ELAN0605", 0 }, | ||
| 1235 | { "ELAN1000", 0 }, | 1236 | { "ELAN1000", 0 }, |
| 1236 | { } | 1237 | { } |
| 1237 | }; | 1238 | }; |
