ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 23 Aug 2012 06:35:01 +0000 (09:35 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Aug 2012 14:39:25 +0000 (15:39 +0100)
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>
arch/arm/mach-omap2/twl-common.c

index 0606f238a2477048a1359d70fd8009914b0e0da9..5d142facb0e6878900259590840503c9531703ea 100644 (file)
@@ -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;
 }