diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:25:40 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:25:40 -0700 |
commit | 4a7126a25b4dfd07d61c699f724118275acc0c25 (patch) | |
tree | c78b82bfaa96f330d412ad63e355906f963c3faf /drivers/input/touchscreen/Kconfig | |
parent | 930e19248e9b61da36c967687ca79c4d5f977919 (diff) | |
parent | c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 (diff) | |
download | lwn-4a7126a25b4dfd07d61c699f724118275acc0c25.tar.gz lwn-4a7126a25b4dfd07d61c699f724118275acc0c25.zip |
Merge tag 'v4.8' into next
Sync up with mainline to bring in I2C host notify changes and other
updates.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 17f75a67cc46..507981356921 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -1073,6 +1073,7 @@ config TOUCHSCREEN_SILEAD config TOUCHSCREEN_SIS_I2C tristate "SiS 9200 family I2C touchscreen" depends on I2C + select CRC_ITU_T depends on GPIOLIB || COMPILE_TEST help This enables support for SiS 9200 family over I2C based touchscreens. |