diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-26 04:50:01 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-26 04:50:01 -0500 |
| commit | ccecc127a858927d45a9d004fa76866645eaff40 (patch) | |
| tree | 7b0a87c64b275a3619b13a4fcdcc639b9970c49e /sound/soc/imx | |
| parent | 573f89b5f39a8b7b4f0a21a7567dd1121430a3c3 (diff) | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/imx')
| -rw-r--r-- | sound/soc/imx/eukrea-tlv320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index a08e822e0158..75fb4b83548b 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c | |||
| @@ -79,7 +79,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { | |||
| 79 | .name = "tlv320aic23", | 79 | .name = "tlv320aic23", |
| 80 | .stream_name = "TLV320AIC23", | 80 | .stream_name = "TLV320AIC23", |
| 81 | .codec_dai_name = "tlv320aic23-hifi", | 81 | .codec_dai_name = "tlv320aic23-hifi", |
| 82 | .platform_name = "imx-pcm-audio.0", | 82 | .platform_name = "imx-fiq-pcm-audio.0", |
| 83 | .codec_name = "tlv320aic23-codec.0-001a", | 83 | .codec_name = "tlv320aic23-codec.0-001a", |
| 84 | .cpu_dai_name = "imx-ssi.0", | 84 | .cpu_dai_name = "imx-ssi.0", |
| 85 | .ops = &eukrea_tlv320_snd_ops, | 85 | .ops = &eukrea_tlv320_snd_ops, |