diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-25 13:54:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-25 13:54:57 -0700 |
| commit | ba53c4518c7bf3b3abda54284cfb2a6d2175749b (patch) | |
| tree | 9f56beb17efa19aafebb40d245d5c159bf4c4b12 /drivers/input | |
| parent | 63e553c0c5ad690fb0f4e9990dd77f93441b3afc (diff) | |
| parent | a4b9c109c2f9143790c1d1a96475eecf7338713a (diff) | |
Merge "Merge tag v4.4.55 into branch 'msm-4.4'"
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[] = { { "ELAN0000", 0 }, { "ELAN0100", 0 }, { "ELAN0600", 0 }, + { "ELAN0605", 0 }, { "ELAN1000", 0 }, { } }; |