Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 75838d7..98d2635 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -187,6 +187,23 @@ config TOUCHSCREEN_DA9034
          Say Y here to enable the support for the touchscreen found
          on Dialog Semiconductor DA9034 PMIC.
 
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called da9034-ts.
+
+config TOUCHSCREEN_DA9052
+       tristate "Dialog DA9052/DA9053 TSI"
+       depends on PMIC_DA9052
+       help
+         Say Y here to support the touchscreen found on Dialog Semiconductor
+         DA9052-BC and DA9053-AA/Bx PMICs.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called da9052_tsi.
+
 config TOUCHSCREEN_DYNAPRO
        tristate "Dynapro serial touchscreen"
        select SERIO
@@ -306,6 +323,18 @@ config TOUCHSCREEN_WACOM_W8001
          To compile this driver as a module, choose M here: the
          module will be called wacom_w8001.
 
+config TOUCHSCREEN_WACOM_I2C
+       tristate "Wacom Tablet support (I2C)"
+       depends on I2C
+       help
+         Say Y here if you want to use the I2C version of the Wacom
+         Pen Tablet.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the module
+         will be called wacom_i2c.
+
 config TOUCHSCREEN_LPC32XX
        tristate "LPC32XX touchscreen controller"
        depends on ARCH_LPC32XX
@@ -635,6 +664,7 @@ config TOUCHSCREEN_USB_COMPOSITE
          - Zytronic controllers
          - Elo TouchSystems 2700 IntelliTouch
          - EasyTouch USB Touch Controller from Data Modul
+         - e2i (Mimo monitors)
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -721,7 +751,7 @@ config TOUCHSCREEN_USB_ELO
 
 config TOUCHSCREEN_USB_E2I
        default y
-       bool "e2i Touchscreen controller (e.g. from Mimo 740)"
+       bool "e2i Touchscreen controller (e.g. from Mimo 740)" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ZYTRONIC
@@ -744,7 +774,7 @@ config TOUCHSCREEN_USB_EASYTOUCH
        bool "EasyTouch USB Touch controller device support" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
        help
-         Say Y here if you have a EasyTouch USB Touch controller device support.
+         Say Y here if you have an EasyTouch USB Touch controller.
          If unsure, say N.
 
 config TOUCHSCREEN_TOUCHIT213