diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
| commit | d9227958dc0e56976eaf452a213aee8415a9eb60 (patch) | |
| tree | 1f31cfd333fce67c76e2693c4d55caac39744bee /drivers/input/mouse/elan_i2c_core.c | |
| parent | b0c2d653f718f3d56b4ffdca950aea247ee7dc99 (diff) | |
| parent | 0bd2bedb3501db249b347e5acbfd3415bd7667a5 (diff) | |
Merge tag 'v4.4.138' into linux-linaro-lsk-v4.4lsk-v4.4-18.06
This is the 4.4.138 stable release
Diffstat (limited to 'drivers/input/mouse/elan_i2c_core.c')
| -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 3851d5715772..aeb8250ab079 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1249,6 +1249,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN060B", 0 }, { "ELAN060C", 0 }, { "ELAN0611", 0 }, + { "ELAN0612", 0 }, { "ELAN1000", 0 }, { } }; |