projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-block.git]
/
drivers
/
input
/
touchscreen
/
Kconfig
diff --git
a/drivers/input/touchscreen/Kconfig
b/drivers/input/touchscreen/Kconfig
index 771d95c1122116980c87e658168fa87553408761..80cc69897a4331105801ff3eca9339819727e3c8 100644
(file)
--- a/
drivers/input/touchscreen/Kconfig
+++ b/
drivers/input/touchscreen/Kconfig
@@
-1019,6
+1019,7
@@
config TOUCHSCREEN_SUN4I
config TOUCHSCREEN_SUR40
tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
+ depends on VIDEO_V4L2
select INPUT_POLLDEV
select VIDEOBUF2_DMA_SG
help