From 6dc0fc9074326f6d535e90406e00deee3d6399c9 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 29 Jun 2010 01:31:40 -0300 Subject: [PATCH] --- yaml --- r: 202017 b: refs/heads/master c: a3b1dc95578fd0b524139689a9e0f148a622eb24 h: refs/heads/master i: 202015: e96450aa22253f6353a2c5bf502c3945f99311a0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0efd79e7af2..2465465ff7a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 806ec0fb561b0384f1da6932960643786eac8ec6 +refs/heads/master: a3b1dc95578fd0b524139689a9e0f148a622eb24 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index bdbc9d305419..0f1e2fd2426f 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -559,7 +559,8 @@ config VIDEO_DAVINCI_VPIF config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS + depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 + depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS select FONT_8x16 select VIDEOBUF_VMALLOC default n