From patchwork Fri Jun 12 18:47:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 1219 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 12 Jun 2009 18:52:07 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Fri, 12 Jun 2009 15:54:39 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MFBrB-0006QO-Jx; Fri, 12 Jun 2009 18:52:07 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765130AbZFLSvc (ORCPT + 1 other); Fri, 12 Jun 2009 14:51:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764058AbZFLSvc (ORCPT ); Fri, 12 Jun 2009 14:51:32 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:31521 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764272AbZFLSva (ORCPT ); Fri, 12 Jun 2009 14:51:30 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by acsinet12.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n5CIkTT7006582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Jun 2009 18:46:30 GMT Received: from abhmt001.oracle.com (abhmt001.oracle.com [141.146.116.10]) by acsinet15.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n5CIqRwf005086; Fri, 12 Jun 2009 18:52:27 GMT Received: from [192.168.1.4] (/98.108.130.97) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Jun 2009 11:51:14 -0700 Message-ID: <4A32A2CE.40002@oracle.com> Date: Fri, 12 Jun 2009 11:47:42 -0700 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, LKML , Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: [PATCH -next] v4l: expose function outside of ifdef/endif block References: <20090612185601.be53b034.sfr@canb.auug.org.au> In-Reply-To: <20090612185601.be53b034.sfr@canb.auug.org.au> X-Source-IP: abhmt001.oracle.com [141.146.116.10] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A09020A.4A32A3A3.016B:SCFSTAT5015188,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 Move v4l_bound_align_image() outside of an #ifdef CONFIG_I2C block so that it is always built. Fixes a build error: vivi.c:(.text+0x48e26): undefined reference to `v4l_bound_align_image' Signed-off-by: Randy Dunlap --- drivers/media/video/v4l2-common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- linux-next-20090612.orig/drivers/media/video/v4l2-common.c +++ linux-next-20090612/drivers/media/video/v4l2-common.c @@ -915,6 +915,7 @@ const unsigned short *v4l2_i2c_tuner_add return NULL; } EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs); +#endif /* Clamp x to be between min and max, aligned to a multiple of 2^align. min * and max don't have to be aligned, but there must be at least one valid @@ -986,5 +987,3 @@ void v4l_bound_align_image(u32 *w, unsig } } EXPORT_SYMBOL_GPL(v4l_bound_align_image); - -#endif