diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-06-29 01:31:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:00:58 -0300 |
| commit | a3b1dc95578fd0b524139689a9e0f148a622eb24 (patch) | |
| tree | b3f0fe11add1e097633e4ca7718051cb65fe335e /drivers/media/video/Kconfig | |
| parent | 806ec0fb561b0384f1da6932960643786eac8ec6 (diff) | |
| download | op-kernel-dev-a3b1dc95578fd0b524139689a9e0f148a622eb24.zip op-kernel-dev-a3b1dc95578fd0b524139689a9e0f148a622eb24.tar.gz | |
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/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index bdbc9d3..0f1e2fd 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 |
