diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-04 10:14:44 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-04 10:14:44 +0300 |
| commit | 65e91e2845b5b8965f21a856e1e0ad70c6522ce7 (patch) | |
| tree | 61b1c7e22270297690f02e0c169e917a27304aef /drivers/input/touchscreen/Kconfig | |
| parent | 7ad222b3aed350adfc27ee7eec4587ffe55dfdce (diff) | |
| parent | 44466306ebecc73c68835f5fe27d119591a1ab5c (diff) | |
| download | linux-65e91e2845b5b8965f21a856e1e0ad70c6522ce7.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 5.1 merge window.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 068dbbc610fc..7c597a49c265 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -1168,11 +1168,11 @@ config TOUCHSCREEN_SIS_I2C module will be called sis_i2c. config TOUCHSCREEN_ST1232 - tristate "Sitronix ST1232 touchscreen controllers" + tristate "Sitronix ST1232 or ST1633 touchscreen controllers" depends on I2C help - Say Y here if you want to support Sitronix ST1232 - touchscreen controller. + Say Y here if you want to support the Sitronix ST1232 + or ST1633 touchscreen controller. If unsure, say N. |