Merge branch 'asoc-omap' into for-3.7

7ccf6124 · Mark Brown · 2bbf6078 · eda21d37 · 7ccf6124
Commit 7ccf6124 authored Aug 23, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/mach-omap2/twl-common.c arch/arm/mach-omap2/twl-common.c +1 -1

No files found.
--- 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;
 }