diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 11:02:56 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 11:02:56 -0700 |
| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /drivers/input/touchscreen/Kconfig | |
| parent | 0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff) | |
| parent | 6a5029e66404462a3322dba8e35615bd09332081 (diff) | |
| download | linux-0-day-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.gz linux-0-day-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz | |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index ac5aa12ac190d..ee02dc7422bd1 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -833,6 +833,15 @@ config TOUCHSCREEN_USB_COMPOSITE To compile this driver as a module, choose M here: the module will be called usbtouchscreen. +config TOUCHSCREEN_MX25 + tristate "Freescale i.MX25 touchscreen input driver" + depends on MFD_MX25_TSADC + help + Enable support for touchscreen connected to your i.MX25. + + To compile this driver as a module, choose M here: the + module will be called fsl-imx25-tcq. + config TOUCHSCREEN_MC13783 tristate "Freescale MC13783 touchscreen input driver" depends on MFD_MC13XXX |