From patchwork Wed May 5 22:44:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 97239 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45MmMvT009297 for ; Wed, 5 May 2010 22:48:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758917Ab0EEWr3 (ORCPT ); Wed, 5 May 2010 18:47:29 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:64515 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756767Ab0EEWr1 (ORCPT ); Wed, 5 May 2010 18:47:27 -0400 Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o45MlIfE030152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 May 2010 22:47:19 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o45JxVRV030045; Wed, 5 May 2010 22:47:17 GMT Received: from abhmt015.oracle.com by acsmt353.oracle.com with ESMTP id 217749701273099594; Wed, 05 May 2010 15:46:34 -0700 Received: from chimera.site (/71.245.98.113) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 05 May 2010 15:46:33 -0700 Date: Wed, 5 May 2010 15:44:11 -0700 From: Randy Dunlap To: Stephen Rothwell , linux-media@vger.kernel.org Cc: linux-next@vger.kernel.org, LKML , Mauro Carvalho Chehab Subject: [PATCH -next] media: fix vivi build error Message-Id: <20100505154411.609de129.randy.dunlap@oracle.com> In-Reply-To: <20100505123409.ed5678a2.sfr@canb.auug.org.au> References: <20100505123409.ed5678a2.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: rcsinet15.oracle.com [148.87.113.117] X-CT-RefId: str=0001.0A090207.4BE1F578.00D7:SCFMA4539811,ss=1,fgs=0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 22:48:38 +0000 (UTC) --- linux-next-20100505.orig/drivers/media/video/Kconfig +++ linux-next-20100505/drivers/media/video/Kconfig @@ -559,7 +559,7 @@ config VIDEO_DAVINCI_VPIF config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 + depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS select FONT_8x16 select VIDEOBUF_VMALLOC default n