diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-07 02:12:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-07 02:12:30 +0300 |
| commit | 9772152b4b3cd32a1aadf75e3d1a16a072d3e4a5 (patch) | |
| tree | 39cc36f8f57c305f582764e6bab06c261a153b6e /include | |
| parent | 36daa831b55538dc2e4a906de20c5d91033ebb21 (diff) | |
| parent | 0c043d70d04711fe6c380df9065fdc44192c49bf (diff) | |
| download | linux-9772152b4b3cd32a1aadf75e3d1a16a072d3e4a5.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"A tiny update from Benjamin removing a mistakenly added Elan PNP ID so
that the device is again handled by hid-multitouch"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - remove Lenovo Legion Y7000 PnpID
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input/elan-i2c-ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input/elan-i2c-ids.h b/include/linux/input/elan-i2c-ids.h index ceabb01a6a7d..1ecb6b45812c 100644 --- a/include/linux/input/elan-i2c-ids.h +++ b/include/linux/input/elan-i2c-ids.h @@ -48,7 +48,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0618", 0 }, { "ELAN0619", 0 }, { "ELAN061A", 0 }, - { "ELAN061B", 0 }, +/* { "ELAN061B", 0 }, not working on the Lenovo Legion Y7000 */ { "ELAN061C", 0 }, { "ELAN061D", 0 }, { "ELAN061E", 0 }, |