diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 09:59:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 09:59:26 -0700 |
| commit | f934fb19ef34730263e6afc01e8ec27a8a71470f (patch) | |
| tree | 6988fa3734adb98ab989657c56b7e31e94e723f8 /drivers/input/touchscreen/Kconfig | |
| parent | 3988ba0708e98b4bafc9034aa476775520bee708 (diff) | |
| parent | 72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73 (diff) | |
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: add driver for Atmel integrated touchscreen controller
Input: ads7846 - optimize order of calculating Rt in ads7846_rx()
Input: ads7846 - fix sparse endian warnings
Input: uinput - remove duplicate include
Input: serio - offload resume to kseriod
Input: serio - mark serio_register_driver() __must_check
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index e57366521572..6e60a97a234c 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -205,6 +205,18 @@ config TOUCHSCREEN_TOUCHWIN To compile this driver as a module, choose M here: the module will be called touchwin. +config TOUCHSCREEN_ATMEL_TSADCC + tristate "Atmel Touchscreen Interface" + depends on ARCH_AT91SAM9RL + help + Say Y here if you have a 4-wire touchscreen connected to the + ADC Controller on your Atmel SoC (such as the AT91SAM9RL). + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called atmel_tsadcc. + config TOUCHSCREEN_UCB1400 tristate "Philips UCB1400 touchscreen" select AC97_BUS |