From patchwork Tue Jun 15 00:03:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 3656 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 15 Jun 2010 00:04:53 +0000 Received: from bombadil.infradead.org [18.85.46.34] by localhost with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 15 Jun 2010 07:59:57 +0300 (EEST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OOJe9-0006g0-3t; Tue, 15 Jun 2010 00:04:53 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756507Ab0FOAEb (ORCPT + 1 other); Mon, 14 Jun 2010 20:04:31 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:48681 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754901Ab0FOAEa (ORCPT ); Mon, 14 Jun 2010 20:04:30 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o5F04KSG004955 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jun 2010 00:04:22 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o5EMmU1T017855; Tue, 15 Jun 2010 00:04:17 GMT Received: from abhmt004.oracle.com by acsmt354.oracle.com with ESMTP id 345332741276560200; Mon, 14 Jun 2010 17:03:20 -0700 Received: from chimera.site (/141.144.232.190) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 14 Jun 2010 17:03:20 -0700 Date: Mon, 14 Jun 2010 17:03:19 -0700 From: Randy Dunlap To: Stephen Rothwell , Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org Subject: [PATCH -next] vivi: fix depends again Message-Id: <20100614170319.7647ab62.randy.dunlap@oracle.com> In-Reply-To: <20100614123056.64aad41b.sfr@canb.auug.org.au> References: <20100614123056.64aad41b.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Auth-Type: Internal IP X-Source-IP: rcsinet13.oracle.com [148.87.113.125] X-CT-RefId: str=0001.0A090203.4C16C386.018B:SCFMA4539811,ss=1,fgs=0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Randy Dunlap 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 --- drivers/media/video/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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