diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
| commit | 6e02d8833338866388a3732e65eed1ff72a75a60 (patch) | |
| tree | 77b3407d7bdc182d751ed5440215c3f0aca1427d /drivers/input/mouse/elan_i2c_core.c | |
| parent | 2f7d3ee28cb91bcc63890dbb7f63fde4c63e2340 (diff) | |
| parent | 97f32419d57c154fcc2cda75f65ce06a5920b72d (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linux-linaro-lsk-v4.9-test
Diffstat (limited to 'drivers/input/mouse/elan_i2c_core.c')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 97f6e05cffce..a716482774db 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1251,6 +1251,8 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0611", 0 }, { "ELAN0612", 0 }, { "ELAN0618", 0 }, + { "ELAN061D", 0 }, + { "ELAN0622", 0 }, { "ELAN1000", 0 }, { } }; |