diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-27 20:46:51 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-27 20:46:51 +0530 |
| commit | aaade4b5a3dc0925c344c1a4e01fea35b92e5034 (patch) | |
| tree | 651f0a597f6fc3017513dea028b03d43308d093f /drivers/input | |
| parent | 1e46f3c55187f21829a428c5cd7ca3e12209f3d7 (diff) | |
| parent | 982ce2aa79fbe7c961ee948857d5b5b2a0b2ddd9 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.84-hikey
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index da5458dfb1e3..98d4e515587a 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1235,6 +1235,10 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0100", 0 }, { "ELAN0600", 0 }, { "ELAN0605", 0 }, + { "ELAN0608", 0 }, + { "ELAN0605", 0 }, + { "ELAN0609", 0 }, + { "ELAN060B", 0 }, { "ELAN1000", 0 }, { } }; |