Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-flexiantxendom0-natty.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6675bd7..0c9f4b1 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -659,17 +659,17 @@ config TOUCHSCREEN_PCAP
          To compile this driver as a module, choose M here: the
          module will be called pcap_ts.
 
-config TOUCHSCREEN_TPS6507X
-       tristate "TPS6507x based touchscreens"
+config TOUCHSCREEN_ST1232
+       tristate "Sitronix ST1232 touchscreen controllers"
        depends on I2C
        help
-         Say Y here if you have a TPS6507x based touchscreen
-         controller.
+         Say Y here if you want to support Sitronix ST1232
+         touchscreen controller.
 
          If unsure, say N.
 
          To compile this driver as a module, choose M here: the
-         module will be called tps6507x_ts.
+         module will be called st1232_ts.
 
 config TOUCHSCREEN_STMPE
        tristate "STMicroelectronics STMPE touchscreens"
@@ -681,4 +681,16 @@ config TOUCHSCREEN_STMPE
          To compile this driver as a module, choose M here: the
          module will be called stmpe-ts.
 
+config TOUCHSCREEN_TPS6507X
+       tristate "TPS6507x based touchscreens"
+       depends on I2C
+       help
+         Say Y here if you have a TPS6507x based touchscreen
+         controller.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tps6507x_ts.
+
 endif