From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
linux-media@vger•kernel.org
Subject: [PATCH -next] vivi: fix depends again
Date: Mon, 14 Jun 2010 17:03:19 -0700 [thread overview]
Message-ID: <20100614170319.7647ab62.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100614123056.64aad41b.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•com>
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>
---
drivers/media/video/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-next-20100614.orig/drivers/media/video/Kconfig
+++ linux-next-20100614/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
prev parent reply other threads:[~2010-06-15 0:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-14 2:30 linux-next: Tree for June 14 Stephen Rothwell
2010-06-15 0:03 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100614170319.7647ab62.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox