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: 1364591 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 616723FC66 for ; Thu, 23 Aug 2012 06:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368Ab2HWGfI (ORCPT ); Thu, 23 Aug 2012 02:35:08 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:58052 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833Ab2HWGfG (ORCPT ); Thu, 23 Aug 2012 02:35:06 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKUDXPGZbvdJUeAQKuPYCW5XAeKX1eltuX@postini.com; Wed, 22 Aug 2012 23:35:06 PDT Received: by obbta14 with SMTP id ta14so961233obb.18 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=N4BOtfp+wciCKXUFJHDFe+gAf15LSl9HcWLgtFHleVzL+7Rq+2b3JTbPxID9DT3Xd4 0niPXJpvjOfZ21OM2xqw2BOo8m2H6kb99UgyR41WZ33MFmO/1emOWZ2Eu9nrBjlX5/MB s8vXT8sW7pcXkytTosF/yt2UT0/DLlBmGpWP2rDGLgqZzFatgY2KgPdUtktrlyk17tYz VLLwZLcccWZtBKG/P9oPTVOnDYZ5BTAOvnaLmhMe7YTCa54SJtGnd5XmtG1KE2Ak9VXa r6ktYYySx9JvSjZ1A/RCqdNFmqFOnf1iydOklqrWTdgNpSqFtkJDe5XTydU7qzzXVuRO tArw== 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 Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, Brian Austin , alsa-devel@alsa-project.org 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: ALoCoQkmovdNEAlSjy22UTrgUeIxI/WzRfiC/dtzsUdCUgE0pxhzwhwbgMOcXEgS5mPTiyV1U8RF Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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; }