From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 23 Aug 2012 06:35:01 +0000 (+0300)
Subject: ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
X-Git-Tag: v3.7-rc1~81^2~14^2~127^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eda21d37eb1e7d065d0427679d0947da805ad35d;p=linux.git

ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled

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 <brian.austin@cirrus.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index 0606f238a247..5d142facb0e6 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -559,7 +559,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;
 }