projects/linux·commit d4ec49d3

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

d4ec49d3 · Greg Kroah-Hartman <[email protected]> · 2018-10-20 08:42:56 +02:00

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
Commit
d4ec49d332aba29827504cc666205aef91a281c7
Parents
c7b70a64 · 13c1c5e4

Merge commit. Changes below are compared with the first parent: c7b70a64.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/input/mouse/elan_i2c_core.cmodified+1−0View file

drivers/input/mouse/elan_i2c_core.c

View file
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index f5ae248..b0f9d19 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 },