Merge branch 'mrst-touchscreen' into next

Conflicts:
	drivers/input/touchscreen/Makefile

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 400c99de0bb..d59feb7b90f 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -260,6 +260,18 @@ config TOUCHSCREEN_INEXIO
           To compile this driver as a module, choose M here: the
           module will be called inexio.
 
+config TOUCHSCREEN_INTEL_MID
+        tristate "Intel MID platform resistive touchscreen"
+        depends on INTEL_SCU_IPC
+        help
+          Say Y here if you have a Intel MID based touchscreen in
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called intel_mid_touch.
+
 config TOUCHSCREEN_MK712
         tristate "ICS MicroClock MK712 touchscreen"
         help