diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 11:21:55 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 11:21:55 -0700 |
commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /drivers/input/touchscreen/Kconfig | |
parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
download | linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.gz linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.bz2 linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.zip |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 0069d9703fda..8d320289abf8 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -328,6 +328,15 @@ config TOUCHSCREEN_MIGOR To compile this driver as a module, choose M here: the module will be called migor_ts. +config TOUCHSCREEN_TNETV107X + tristate "TI TNETV107X touchscreen support" + depends on ARCH_DAVINCI_TNETV107X + help + Say Y here if you want to use the TNETV107X touchscreen. + + To compile this driver as a module, choose M here: the + module will be called tnetv107x-ts. + config TOUCHSCREEN_TOUCHRIGHT tristate "Touchright serial touchscreen" select SERIO |