diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-27 18:48:01 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-27 18:48:01 -0700 |
| commit | c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19 (patch) | |
| tree | 6c7ec7cea037f66b9beea02636b02aba7c0e9164 /drivers/input/touchscreen | |
| parent | Input: iqs5xx - remove redundant dev_set_drvdata call (diff) | |
| parent | Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD (diff) | |
| download | linux-dev-c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19.tar.xz linux-dev-c114dc5e5bb3e6b7cf72005ea2fc0a54097cab19.zip | |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/silead.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c index 09241d4cdebc..06f0eb04a8fd 100644 --- a/drivers/input/touchscreen/silead.c +++ b/drivers/input/touchscreen/silead.c @@ -617,6 +617,7 @@ static const struct acpi_device_id silead_ts_acpi_match[] = { { "MSSL1680", 0 }, { "MSSL0001", 0 }, { "MSSL0002", 0 }, + { "MSSL0017", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match); |