diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /drivers/input/mouse/elan_i2c_core.c | |
| parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
| download | blackbird-op-linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.gz blackbird-op-linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip | |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
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 c33f2cce6ba9..2690a8223841 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1261,6 +1261,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0608", 0 }, { "ELAN0609", 0 }, { "ELAN060B", 0 }, + { "ELAN0611", 0 }, { "ELAN1000", 0 }, { } }; |
