projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
Kconfig
diff --git
a/drivers/media/video/Kconfig
b/drivers/media/video/Kconfig
index 491fb082e5df5e6954a9847e67ce02fada38da99..ea7897b4ac1b6d8828bd6195f42e4ee9abe50aaf 100755
(executable)
--- a/
drivers/media/video/Kconfig
+++ b/
drivers/media/video/Kconfig
@@
-1412,7
+1412,7
@@
endchoice
choice
prompt "RKXX CIF work simultaneity"
- depends on VIDEO_RK29
+ depends on VIDEO_RK29
&& ARCH_RK30
default VIDEO_RKCIF_WORK_SIMUL_OFF
---help---
CIFs work simultaneity