git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
Kconfig
diff --git
a/drivers/input/touchscreen/Kconfig
b/drivers/input/touchscreen/Kconfig
index
9a647ee
..
f9a5fd8
100644
(file)
--- a/
drivers/input/touchscreen/Kconfig
+++ b/
drivers/input/touchscreen/Kconfig
@@
-517,9
+517,9
@@
config TOUCHSCREEN_TOUCHWIN
To compile this driver as a module, choose M here: the
module will be called touchwin.
To compile this driver as a module, choose M here: the
module will be called touchwin.
-config TOUCHSCREEN_TI_
TSCAD
C
+config TOUCHSCREEN_TI_
AM335X_TS
C
tristate "TI Touchscreen Interface"
tristate "TI Touchscreen Interface"
- depends on
ARCH_OMAP2PLUS
+ depends on
MFD_TI_AM335X_TSCADC
help
Say Y here if you have 4/5/8 wire touchscreen controller
to be connected to the ADC controller on your TI AM335x SoC.
help
Say Y here if you have 4/5/8 wire touchscreen controller
to be connected to the ADC controller on your TI AM335x SoC.
@@
-527,7
+527,7
@@
config TOUCHSCREEN_TI_TSCADC
If unsure, say N.
To compile this driver as a module, choose M here: the
If unsure, say N.
To compile this driver as a module, choose M here: the
- module will be called ti_
tscad
c.
+ module will be called ti_
am335x_ts
c.
config TOUCHSCREEN_ATMEL_TSADCC
tristate "Atmel Touchscreen Interface"
config TOUCHSCREEN_ATMEL_TSADCC
tristate "Atmel Touchscreen Interface"