diff --git a/[refs] b/[refs] index f0d6ef879b8a..b8abe271c59e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a54d1dea0071a4f6aa46d8e937428c053732efcb +refs/heads/master: 2db2da913fb7d10a0281cd856135ef19fc2e67a8 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 37072a21d8c9..2c292eee2473 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -382,7 +382,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---