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

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

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 32267c1..2a80675 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -92,6 +92,19 @@ config TOUCHSCREEN_AD7879_SPI
          To compile this driver as a module, choose M here: the
          module will be called ad7879-spi.
 
+config TOUCHSCREEN_ADC
+       tristate "Generic ADC based resistive touchscreen"
+       depends on IIO
+       select IIO_BUFFER_CB
+       help
+         Say Y here if you want to use the generic ADC
+         resistive touchscreen driver.
+
+         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 resistive-adc-touch.ko.
+
 config TOUCHSCREEN_AR1021_I2C
        tristate "Microchip AR1020/1021 i2c touchscreen"
        depends on I2C && OF
@@ -151,6 +164,18 @@ config TOUCHSCREEN_BU21013
          To compile this driver as a module, choose M here: the
          module will be called bu21013_ts.
 
+config TOUCHSCREEN_BU21029
+       tristate "Rohm BU21029 based touch panel controllers"
+       depends on I2C
+       help
+         Say Y here if you have a Rohm BU21029 touchscreen controller
+         connected to your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bu21029_ts.
+
 config TOUCHSCREEN_CHIPONE_ICN8318
        tristate "chipone icn8318 touchscreen controller"
        depends on GPIOLIB || COMPILE_TEST