Merge branch 'asoc-omap' into for-3.7

2012-08-23 15:41:24 +01:00 · 2012-08-23 15:41:24 +01:00 · 7ccf6124fa
commit 7ccf6124fa
parent 2bbf6078dc eda21d37eb
1 changed files with 1 additions and 1 deletions
--- 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;
 }