From a3b1dc95578fd0b524139689a9e0f148a622eb24 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 29 Jun 2010 01:31:40 -0300 Subject: [PATCH] V4L/DVB: vivi: fix depends again My previous patch to depend on FONTS was not sufficient since FONTS is boolean. VIDEO_VIVI needs to depend on a tristate so that it won't be enabled as =y when framebuffer is built as modular, so modify it to depend on the same symbols that FONTS depends on, which are FRAMEBUFFER_CONSOLE || STI_CONSOLE. Fixes this build error when VIDEO_VIVI=y and FRAMEBUFFER_CONSOLE=m: vivi.c:(.init.text+0x7205): undefined reference to `find_font' Signed-off-by: Randy Dunlap Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index bdbc9d305419..0f1e2fd2426f 100644 --- a/drivers/media/video/Kconfig +++ b/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 -- 2.30.2