summaryrefslogtreecommitdiffstats
path: root/sound/soc/imx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-26 09:50:01 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-26 09:50:01 +0000
commitccecc127a858927d45a9d004fa76866645eaff40 (patch)
tree7b0a87c64b275a3619b13a4fcdcc639b9970c49e /sound/soc/imx
parent573f89b5f39a8b7b4f0a21a7567dd1121430a3c3 (diff)
parent43c63188821dc21b2af23a40a18faea6e386e90a (diff)
downloadblackbird-op-linux-ccecc127a858927d45a9d004fa76866645eaff40.tar.gz
blackbird-op-linux-ccecc127a858927d45a9d004fa76866645eaff40.zip
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.c2
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 = {
.name = "tlv320aic23",
.stream_name = "TLV320AIC23",
.codec_dai_name = "tlv320aic23-hifi",
- .platform_name = "imx-pcm-audio.0",
+ .platform_name = "imx-fiq-pcm-audio.0",
.codec_name = "tlv320aic23-codec.0-001a",
.cpu_dai_name = "imx-ssi.0",
.ops = &eukrea_tlv320_snd_ops,
OpenPOWER on IntegriCloud