Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-3.10.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 21d55ed4b88a69e08881a4b03f1ef9dbf20548d2..971618059a6f6a25648cf3f031548f1d5bc4a20d 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -11,6 +11,24 @@ menuconfig INPUT_TOUCHSCREEN
 
 if INPUT_TOUCHSCREEN
 
+config TOUCHSCREEN_ADS7846
+       tristate "ADS 7846/7843 based touchscreens"
+       depends on SPI_MASTER
+       depends on HWMON = n || HWMON
+       help
+         Say Y here if you have a touchscreen interface using the
+         ADS7846 or ADS7843 controller, and your board-specific setup
+         code includes that in its table of SPI devices.
+
+         If HWMON is selected, and the driver is told the reference voltage
+         on your board, you will also get hwmon interfaces for the voltage
+         (and on ads7846, temperature) sensors of this chip.
+
+         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 ads7846.
+
 config TOUCHSCREEN_BITSY
        tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
        depends on SA1100_BITSY
@@ -85,7 +103,7 @@ config TOUCHSCREEN_MK712
 
 config TOUCHSCREEN_HP600
        tristate "HP Jornada 680/690 touchscreen"
-       depends on SH_HP600 && SH_ADC
+       depends on SH_HP6XX && SH_ADC
        help
          Say Y here if you have a HP Jornada 680 or 690 and want to
           support the built-in touchscreen.
@@ -95,4 +113,55 @@ config TOUCHSCREEN_HP600
          To compile this driver as a module, choose M here: the
          module will be called hp680_ts_input.
 
+config TOUCHSCREEN_PENMOUNT
+       tristate "Penmount serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Penmount serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called penmount.
+
+config TOUCHSCREEN_TOUCHRIGHT
+       tristate "Touchright serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Touchright serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called touchright.
+
+config TOUCHSCREEN_TOUCHWIN
+       tristate "Touchwin serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Touchwin serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called touchwin.
+
+config TOUCHSCREEN_UCB1400
+       tristate "Philips UCB1400 touchscreen"
+       select AC97_BUS
+       help
+         This enables support for the Philips UCB1400 touchscreen interface.
+         The UCB1400 is an AC97 audio codec.  The touchscreen interface
+         will be initialized only after the ALSA subsystem has been
+         brought up and the UCB1400 detected.  You therefore have to
+         configure ALSA support as well (either built-in or modular,
+         independently of whether this driver is itself built-in or
+         modular) for this driver to work.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ucb1400_ts.
+
 endif