aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-06-29 00:31:40 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 14:00:58 -0400
commita3b1dc95578fd0b524139689a9e0f148a622eb24 (patch)
treeb3f0fe11add1e097633e4ca7718051cb65fe335e /drivers/media/video/Kconfig
parent806ec0fb561b0384f1da6932960643786eac8ec6 (diff)
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 <randy.dunlap@oracle.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r--drivers/media/video/Kconfig3
1 files changed, 2 insertions, 1 deletions
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
559 559
560config VIDEO_VIVI 560config VIDEO_VIVI
561 tristate "Virtual Video Driver" 561 tristate "Virtual Video Driver"
562 depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS 562 depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
563 depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS
563 select FONT_8x16 564 select FONT_8x16
564 select VIDEOBUF_VMALLOC 565 select VIDEOBUF_VMALLOC
565 default n 566 default n