Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 565ec711c2eefa6e5dc0f75dc4be5d1f6569a962..8b5fd6423897ad032e3d0a0376909c9760645774 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -170,6 +170,46 @@ config TOUCHSCREEN_TOUCHWIN
          To compile this driver as a module, choose M here: the
          module will be called touchwin.
 
+config TOUCHSCREEN_TSC2005
+       tristate "TSC2005 touchscreen support"
+       help
+         Say Y here for if you are using the touchscreen features of TSC2301.
+
+config TOUCHSCREEN_TSC2102
+       tristate "TSC 2102 based touchscreens"
+       depends on SPI_MASTER
+       select SPI_TSC2102
+       help
+         Say Y here if you have a touchscreen interface using the
+         TI TSC 2102 controller, and your board-specific initialization
+         code includes that in its table of SPI devices.  Also make
+         sure the proper SPI controller is selected.
+
+         If unsure, say N (but it's safe to say "Y").
+
+         To compile this driver as a module, choose M here: the
+         module will be called tsc2102_ts.
+
+config TOUCHSCREEN_TSC210X
+       tristate "TI TSC210x based touchscreens"
+       depends on SPI_MASTER
+       select SPI_TSC210X
+       help
+         Say Y here if you have a touchscreen interface using a
+         TI TSC210x controller, and your board-specific initialisation
+         code includes that in its table of SPI devices.
+
+         If unsure, say N (but it's safe to say "Y").
+
+         To compile this driver as a module, choose M here: the
+         module will be called tsc210x_ts.
+
+config TOUCHSCREEN_TSC2301
+       tristate "TSC2301 touchscreen support"
+       depends on SPI_TSC2301
+       help
+         Say Y here for if you are using the touchscreen features of TSC2301.
+
 config TOUCHSCREEN_UCB1400
        tristate "Philips UCB1400 touchscreen"
        select AC97_BUS