diff options
| author | Linus Torvalds | 2017-02-17 09:56:34 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-02-17 09:56:34 -0800 |
| commit | a0d5ef457393a240869d837cda1ccb22bbbe3dc2 (patch) | |
| tree | 0d0fe184142b5efa810e9296952aab10b5c6e79c | |
| parent | 444a034d390da1b636bb2c5f02ebaa08cdbe8de1 (diff) | |
| parent | 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (diff) | |
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
| -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 fa598f7f4372..1e1d0ad406f2 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1231,6 +1231,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0000", 0 }, { "ELAN0100", 0 }, { "ELAN0600", 0 }, + { "ELAN0605", 0 }, { "ELAN1000", 0 }, { } }; |