From patchwork Thu Jan 20 14:12:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 491971 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0KEUWGr011715 for ; Thu, 20 Jan 2011 14:30:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755637Ab1ATOMW (ORCPT ); Thu, 20 Jan 2011 09:12:22 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:57285 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755566Ab1ATOMW (ORCPT ); Thu, 20 Jan 2011 09:12:22 -0500 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MPZwH-1PboeJ3bN3-004iH3; Thu, 20 Jan 2011 15:12:19 +0100 Received: from Lupus.CS.local (unknown [192.168.102.87]) by corscience.de (Postfix) with ESMTP id 3DC365213D; Thu, 20 Jan 2011 15:12:18 +0100 (CET) From: Thomas Weber To: linux-omap@vger.kernel.org Cc: Thomas Weber Subject: [PATCH] OMAP: omap-mcbsp: Fix building after replacement Date: Thu, 20 Jan 2011 15:12:11 +0100 Message-Id: <1295532731-5438-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.4.rc2 X-Provags-ID: V02:K0:Idatx0kN9IaGALIxDyKFB/7/EBXPpwOfCdbKXXVgUtD bhJochyjRWQQUoY9PNyg5I5UxkSmmKO1AIPH3bLWesmnhDvJ8R kbTH1zkNJhKU7aASRra0Rqh7AkeOhtTUvfE+F1W796YQwrgDC9 HBqEzPf/jfD9fBqujr86l4SM0TTxH8s9DoXGLPxDz2P0McsOwJ /GkA8yXRQIJwV3lhPFUJg== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 20 Jan 2011 14:30:34 +0000 (UTC) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 3cc293b..ede6afd 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -113,6 +113,7 @@ static const int omap44xx_dma_reqs[][2] = { static const int omap44xx_dma_reqs[][2] = {}; #endif +#if defined(CONFIG_SOC_OMAP2420) static const unsigned long omap2420_mcbsp_port[][2] = { { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1, OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 }, diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index b7b0ce1..37dc721 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -54,6 +54,7 @@ enum omap_mcbsp_div { #undef NUM_LINKS #define NUM_LINKS 4 #endif +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430) #undef NUM_LINKS #define NUM_LINKS 5 #endif