diff --git a/[refs] b/[refs] index 21d86d464bf2..b9dd92d9af5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe51f819bcbaa1fe94291f4bbe2a6a40c1653b54 +refs/heads/master: ac72fed79fbbdb35882b393401584435c9fc37ac diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 2e571eb9313a..c9f14bfc8544 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -363,7 +363,7 @@ endmenu # encoder / decoder chips config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 select VIDEOBUF_VMALLOC default n ---help---