Merge branch 'asoc-omap' into for-3.7 (7ccf6124) · Commits · e / devices / android_kernel_fairphone_FP5

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -559,7 +559,7 @@ void __init omap_twl4030_audio_init(char *card_name)
	}		}

	#else /* SOC_OMAP_TWL4030 */		#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;		return;
	}		}