Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d5ef45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull input fix from Dmitry Torokhov:
 "Just a single change to Elan touchpad driver to recognize a new ACPI
  ID"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - add ELAN0605 to the ACPI table
parents 444a034d 722c5ac7

drivers/input/mouse/elan_i2c_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0000", 0 },

	{ "ELAN0100", 0 },

	{ "ELAN0600", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN1000", 0 },

	{ }

};