summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/zylonite.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-03 12:56:34 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-03 12:56:34 +0100
commitd207df2df064c19a2cf4eac8f887351fe5ce526e (patch)
treef2005e1b2017c5e35a297318dcf6fe8a635f7c87 /sound/soc/pxa/zylonite.c
parent1aa924e21eec9dbb2c5fae90a71451a700db4414 (diff)
parentc8900a0fad5ae9f4823451de17ba5dec6653ac74 (diff)
Merge branch 'fix/hda' into topic/hda
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 b222a7d72027..25bba108fea3 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",
},
{