projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.2-rc3' into next
[linux-2.6-microblaze.git]
/
drivers
/
input
/
touchscreen
/
Kconfig
diff --git
a/drivers/input/touchscreen/Kconfig
b/drivers/input/touchscreen/Kconfig
index
a854c6e
..
5b272ba
100644
(file)
--- a/
drivers/input/touchscreen/Kconfig
+++ b/
drivers/input/touchscreen/Kconfig
@@
-11,9
+11,9
@@
menuconfig INPUT_TOUCHSCREEN
if INPUT_TOUCHSCREEN
-config
OF_TOUCHSCREEN
+config
TOUCHSCREEN_PROPERTIES
def_tristate INPUT
- depends on INPUT
&& OF
+ depends on INPUT
config TOUCHSCREEN_88PM860X
tristate "Marvell 88PM860x touchscreen"