diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 10:03:22 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 10:03:22 -0800 |
| commit | 7b179e251ba089898b4e8e6d065be8ae2c0a4a3e (patch) | |
| tree | d8c5fe6a2d5330da4d7e53e8b85c1540e1fa404a /drivers/input/mouse | |
| parent | Input: soc_button_array - use NULL for GPIO connection ID (diff) | |
| parent | Input: sparse-keymap - use a managed allocation for keymap copy (diff) | |
| download | linux-dev-7b179e251ba089898b4e8e6d065be8ae2c0a4a3e.tar.xz linux-dev-7b179e251ba089898b4e8e6d065be8ae2c0a4a3e.zip | |
Merge branch 'ib/4.10-sparse-keymap-managed' into next
This brings in version of sparse keymap code that uses managed memory.
Diffstat (limited to 'drivers/input/mouse')
| -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 2c7d2872636c..352050e9031d 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1221,6 +1221,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0000", 0 }, { "ELAN0100", 0 }, { "ELAN0600", 0 }, + { "ELAN0605", 0 }, { "ELAN1000", 0 }, { } }; |