From patchwork Thu Aug 23 06:35:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1364611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id C0BF5DF2AB for ; Thu, 23 Aug 2012 06:38:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4R0b-0005H5-C7; Thu, 23 Aug 2012 06:35:13 +0000 Received: from na3sys009aog133.obsmtp.com ([74.125.149.82]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T4R0V-0005GB-Br for linux-arm-kernel@lists.infradead.org; Thu, 23 Aug 2012 06:35:11 +0000 Received: from mail-ob0-f169.google.com ([209.85.214.169]) (using TLSv1) by na3sys009aob133.postini.com ([74.125.148.12]) with SMTP ID DSNKUDXPGZbvdJUeAQKuPYCW5XAeKX1eltuX@postini.com; Wed, 22 Aug 2012 23:35:07 PDT Received: by obhx4 with SMTP id x4so803209obh.28 for ; Wed, 22 Aug 2012 23:35:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=UMVn8W+c5UYrgnAXhTaW9KjcPjP3u2ho1GTFUtD5rvg=; b=WsbRWn09y38eVw1WEpQZpXh7K9nHOPrBsmyc1I3MSPoAfKkaU8msopLT2m8U96r1gE 21POoi9zBZO8XWMihF89TAc/GYVSDZ+7vsPEYSa83L8DaY7xNLxLw2YG5L9f63Ifes/8 5Lv5Hd3vTVwt3H87MZfEFkr1WltE3EjvqoXk8lwToroZkIgidsjq4DMCvHybga43aC9/ 7xRy0waURs7HjnOqYW+yytG/4KwG/h+e++KU8Z8uEYA50UZTpLzzUUsHM3KNbr3w+R/L o0fWylNnl8XlT0tYIl+8uFRV/lgiHdC64jpPvxAbfYggGmAUpJfh98ZOL4dXb1juuBSg fCYQ== Received: by 10.60.13.228 with SMTP id k4mr310018oec.28.1345703705043; Wed, 22 Aug 2012 23:35:05 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id s7sm4403343oec.7.2012.08.22.23.35.02 (version=SSLv3 cipher=OTHER); Wed, 22 Aug 2012 23:35:04 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled Date: Thu, 23 Aug 2012 09:35:01 +0300 Message-Id: <1345703701-27283-1-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkF/4kpDdzc2TaqhRGLF9cyPzQYhUwzg5pyT08N77JlF7G/r2ruDzipUJRKvpiG0ugqRU+K X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.82 listed in list.dnswl.org] Cc: alsa-devel@alsa-project.org, Brian Austin , linux-omap@vger.kernel.org, linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Fixes: CC arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’ arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 When building the kernel with !SND_OMAP_SOC_OMAP_TWL4030 Reported-by: Brian Austin Signed-off-by: Peter Ujfalusi --- arch/arm/mach-omap2/twl-common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 1c6045a..2919d7a 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -544,7 +544,7 @@ void __init omap_twl4030_audio_init(char *card_name) } #else /* SOC_OMAP_TWL4030 */ -void __init omap_twl4030_audio_init(char *card_name, int codec_sysclk) +void __init omap_twl4030_audio_init(char *card_name) { return; }