Merge branch 'asoc-omap' into for-3.7

git-mirror · Aug 23, 2012 · 7ccf612 · 7ccf612
2 parents 2bbf607 + eda21d3
commit 7ccf612
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 }