Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9d3e3e50c67171009bd0762c69c99b8ed6f1f1c1..f888f84e83d7769dc6ee811feb637cbec1442cd9 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -313,7 +313,7 @@ comment "MPEG video encoders"
 
 config VIDEO_CX2341X
        tristate "Conexant CX2341x MPEG encoders"
-       depends on VIDEO_V4L2 && EXPERIMENTAL
+       depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON
        ---help---
          Support for the Conexant CX23416 MPEG encoders
          and CX23415 MPEG encoder/decoders.
@@ -390,7 +390,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
-       depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+       depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
        select VIDEOBUF_VMALLOC
        default n
        ---help---