Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ccf6124 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-omap' into for-3.7

parents 2bbf6078 eda21d37

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

}