Merge branch 'asoc-omap' into for-3.7

This commit is contained in:
Mark Brown 2012-08-23 15:41:24 +01:00
commit 7ccf6124fa

View 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;
}