---

yaml --- r: 47225 b: refs/heads/master c: cb4c048 h: refs/heads/master i: 47223: 82002b6 v: v3
git-mirror · Feb 9, 2007 · 6a76b1d · 6a76b1d
1 parent a338b39
commit 6a76b1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97952f601e939278df1194bac56b9755338ee7c1
+refs/heads/master: cb4c048b9306555ccbdb97eaf7922624664b0eb1
diff --git a/trunk/sound/soc/pxa/tosa.c b/trunk/sound/soc/pxa/tosa.c
@@ -40,6 +40,7 @@
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
+#include "pxa2xx-ac97.h"
 
 static struct snd_soc_machine tosa;
 
@@ -228,20 +229,21 @@ static struct snd_soc_dai_link tosa_dai[] = {
 	.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],
 	.codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],
 	.init = tosa_ac97_init,
+	.ops = &tosa_ops,
 },
 {
 	.name = "AC97 Aux",
 	.stream_name = "AC97 Aux",
 	.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],
 	.codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX],
+	.ops = &tosa_ops,
 },
 };
 
 static struct snd_soc_machine tosa = {
 	.name = "Tosa",
 	.dai_link = tosa_dai,
 	.num_links = ARRAY_SIZE(tosa_dai),
-	.ops = &tosa_ops,
 };
 
 static struct snd_soc_device tosa_snd_devdata = {