Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3b1dc95 authored by Randy Dunlap's avatar Randy Dunlap Committed by Mauro Carvalho Chehab
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 806ec0fb

drivers/media/video/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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