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
This commit is contained in:
Greg Kroah-Hartman 2018-10-20 08:42:56 +02:00
commit d4ec49d332

View File

@ -1346,6 +1346,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
{ "ELAN0611", 0 }, { "ELAN0611", 0 },
{ "ELAN0612", 0 }, { "ELAN0612", 0 },
{ "ELAN0618", 0 }, { "ELAN0618", 0 },
{ "ELAN061C", 0 },
{ "ELAN061D", 0 }, { "ELAN061D", 0 },
{ "ELAN0622", 0 }, { "ELAN0622", 0 },
{ "ELAN1000", 0 }, { "ELAN1000", 0 },