Merge branch 'for-linus' into next

[linux-2.6-block.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index ac5aa12ac190dcf42d0410be5f9d4e6738db8faf..ee02dc7422bd1a9c03d9171b83a75e3032144bc5 100644 (file)
--- 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