diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-20 08:42:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-20 08:42:56 +0200 |
| commit | d4ec49d332aba29827504cc666205aef91a281c7 (patch) | |
| tree | 726ccbedd45239364923f54c97108770de236742 | |
| parent | c7b70a641df26002e8f26e2b8122fcb6a1d815a1 (diff) | |
| parent | 13c1c5e4d7f887cba36c5e3df3faa22071c1469f (diff) | |
| download | linux-d4ec49d332aba29827504cc666205aef91a281c7.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Dmitry writes:
"Input updates for 4.19-rc8
Just an addition to elan touchpad driver ACPI table."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM
| -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 f5ae24865355..b0f9d19b3410 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1346,6 +1346,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0611", 0 }, { "ELAN0612", 0 }, { "ELAN0618", 0 }, + { "ELAN061C", 0 }, { "ELAN061D", 0 }, { "ELAN0622", 0 }, { "ELAN1000", 0 }, |