projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.4-rc4' into next
[cascardo/linux.git]
/
drivers
/
input
/
touchscreen
/
Kconfig
diff --git
a/drivers/input/touchscreen/Kconfig
b/drivers/input/touchscreen/Kconfig
index
c5eb2b9
..
ba7c565
100644
(file)
--- a/
drivers/input/touchscreen/Kconfig
+++ b/
drivers/input/touchscreen/Kconfig
@@
-260,7
+260,7
@@
config TOUCHSCREEN_ILI210X
config TOUCHSCREEN_S3C2410
tristate "Samsung S3C2410/generic touchscreen input driver"
- depends on ARCH_S3C24
10
|| SAMSUNG_DEV_TS
+ depends on ARCH_S3C24
XX
|| SAMSUNG_DEV_TS
select S3C_ADC
help
Say Y here if you have the s3c2410 touchscreen.