diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 18:30:15 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 18:30:15 +0200 |
| commit | 754451342fc5954061ede74b0a8485ec4a4c6eaa (patch) | |
| tree | 82daccba5779de492631c42e47a614bd9d4cddd2 /drivers/input/touchscreen/Kconfig | |
| parent | Input: psmouse-smbus - allow to control psmouse_deactivate (diff) | |
| parent | Linux 4.17-rc6 (diff) | |
| download | linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.tar.xz linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.zip | |
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 94cc740a4203..32267c1afebc 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -373,7 +373,7 @@ config TOUCHSCREEN_HIDEEP If unsure, say N. - To compile this driver as a moudle, choose M here : the + To compile this driver as a module, choose M here : the module will be called hideep_ts. config TOUCHSCREEN_ILI210X |