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

Commit ccecc127 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 573f89b5 43c63188

sound/soc/imx/eukrea-tlv320.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { 
	.name		= "tlv320aic23",

	.name		= "tlv320aic23",

	.stream_name	= "TLV320AIC23",

	.stream_name	= "TLV320AIC23",

	.codec_dai_name	= "tlv320aic23-hifi",

	.codec_dai_name	= "tlv320aic23-hifi",

	.platform_name	= "imx-pcm-audio.0",

	.platform_name	= "imx-fiq-pcm-audio.0",

	.codec_name	= "tlv320aic23-codec.0-001a",

	.codec_name	= "tlv320aic23-codec.0-001a",

	.cpu_dai_name	= "imx-ssi.0",

	.cpu_dai_name	= "imx-ssi.0",

	.ops		= &eukrea_tlv320_snd_ops,

	.ops		= &eukrea_tlv320_snd_ops,