Merge branch 'asoc-omap' into for-3.7
This commit is contained in:
commit
7ccf6124fa
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue