summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/zylonite.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-25 11:45:09 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-25 11:45:09 +0000
commit5448716ba966307d518d5c6fd52a9de5e7108e26 (patch)
treeb1c444f0e479a2ea71d0bef72e5bc750219fa252 /sound/soc/pxa/zylonite.c
parenta3cd50deef7ba7df506af5347764a00b4621d7a7 (diff)
parent4bfc4e2508234f9149fd33fae853e99fb9e4a75b (diff)
downloadop-kernel-dev-5448716ba966307d518d5c6fd52a9de5e7108e26.zip
op-kernel-dev-5448716ba966307d518d5c6fd52a9de5e7108e26.tar.gz
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/pxa/zylonite.c')
-rw-r--r--sound/soc/pxa/zylonite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index c585829..ac57726 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.stream_name = "AC97 HiFi",
.codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio",
- .cpu_dai_name = "pxa-ac97.0",
+ .cpu_dai_name = "pxa2xx-ac97",
.codec_name = "wm9713-hifi",
.init = zylonite_wm9713_init,
},
@@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.stream_name = "AC97 Aux",
.codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio",
- .cpu_dai_name = "pxa-ac97.1",
+ .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_name = "wm9713-aux",
},
{
OpenPOWER on IntegriCloud