From patchwork Wed Aug 26 06:42:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi DOYU X-Patchwork-Id: 43876 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7Q6gtZM021017 for ; Wed, 26 Aug 2009 06:42:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185AbZHZGmb (ORCPT ); Wed, 26 Aug 2009 02:42:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756878AbZHZGma (ORCPT ); Wed, 26 Aug 2009 02:42:30 -0400 Received: from smtp.nokia.com ([192.100.122.233]:33831 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185AbZHZGmW (ORCPT ); Wed, 26 Aug 2009 02:42:22 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n7Q6g5hm027025; Wed, 26 Aug 2009 09:42:08 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 26 Aug 2009 09:42:18 +0300 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 26 Aug 2009 09:42:17 +0300 Received: from oreo.research.nokia.com (esdhcp04130.research.nokia.com [172.21.41.30]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n7Q6gFWt008174 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Wed, 26 Aug 2009 09:42:16 +0300 Received: from doyu by oreo.research.nokia.com with local (Exim 4.69) (envelope-from ) id 1MgCD1-0000K1-LS; Wed, 26 Aug 2009 09:42:15 +0300 From: Hiroshi DOYU To: linux-omap@vger.kernel.org Cc: ameya.palande@nokia.com, h-kanigeri2@ti.com, x0095840@ti.com, omar.ramirez@ti.com, nm@ti.com, Hiroshi DOYU Subject: [PATCH 2/2] DSPBRIDGE: fix build error for undefined WCD_debugMask with debug Date: Wed, 26 Aug 2009 09:42:15 +0300 Message-Id: <1251268935-1215-2-git-send-email-Hiroshi.DOYU@nokia.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1251268935-1215-1-git-send-email-Hiroshi.DOYU@nokia.com> References: <1251268935-1215-1-git-send-email-Hiroshi.DOYU@nokia.com> X-OriginalArrivalTime: 26 Aug 2009 06:42:17.0913 (UTC) FILETIME=[5ADF3A90:01CA2618] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c index 8708c78..ee15b02 100644 --- a/drivers/dsp/bridge/pmgr/wcd.c +++ b/drivers/dsp/bridge/pmgr/wcd.c @@ -145,6 +145,18 @@ #define MAX_STREAMS 16 #define MAX_BUFS 64 +/* Device IOCtl function pointer */ +struct WCD_Cmd { + u32(*fxn)(union Trapped_Args *args); + u32 dwIndex; +} ; + +/* ----------------------------------- Globals */ +#if GT_TRACE +static struct GT_Mask WCD_debugMask = { NULL, NULL }; /* Core VxD Mask */ +#endif +static u32 WCD_cRefs; + static inline void __cp_fm_usr(void *to, const void __user *from, DSP_STATUS *err, unsigned long bytes) { @@ -185,18 +197,6 @@ static inline void __cp_to_usr(void __user *to, const void *from, #define cp_to_usr(to, from, err, n) \ __cp_to_usr(to, from, &(err), (n) * sizeof(*(from))) -/* Device IOCtl function pointer */ -struct WCD_Cmd { - u32(*fxn)(union Trapped_Args *args); - u32 dwIndex; -} ; - -/* ----------------------------------- Globals */ -#if GT_TRACE -static struct GT_Mask WCD_debugMask = { NULL, NULL }; /* Core VxD Mask */ -#endif -static u32 WCD_cRefs; - /* * Function table. * The order of these functions MUST be the same as the order of the command