diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 22:50:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 22:50:24 +0300 |
commit | d68798374bcf5cd4a19105b86d96121651b3c8cb (patch) | |
tree | 5e7432adf2b61f1497a4c3138c969e8664c54b6e /drivers/input/touchscreen/Kconfig | |
parent | 412ecd7751a2653ab17df39a1dc3565a548633fd (diff) | |
parent | 2a598df595d33be0f12e37ef5df75eff13511d07 (diff) | |
download | linux-d68798374bcf5cd4a19105b86d96121651b3c8cb.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: remove scan_keyb driver
Input: i8042 - fix AUX IRQ delivery check
Input: wistron - add support for Fujitsu-Siemens Amilo D88x0
Input: inport - use correct config option for ATIXL
Input: HIL - handle erros from input_register_device()
Input: tsdev - schedule removal
Input: add Atlas button driver
Input: ads7846 - be more compatible with the hwmon framework
Input: ads7846 - detect pen up from GPIO state
Input: ads7846 - select correct SPI mode
Input: ads7846 - switch to using hrtimer
Input: ads7846 - optionally leave Vref on during differential measurements
Input: ads7846 - pluggable filtering logic
Input: gpio-keys - keyboard driver for GPIO buttons
Input: hid-ff - add support for Logitech Momo racing wheel
Input: i8042 - really suppress ACK/NAK during panic blink
Input: pc110pad - return proper error
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 6b46c9bf1d20..971618059a6f 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -12,13 +12,18 @@ menuconfig INPUT_TOUCHSCREEN if INPUT_TOUCHSCREEN config TOUCHSCREEN_ADS7846 - tristate "ADS 7846 based touchscreens" + 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 controller, and your board-specific initialization + 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 |