From cb4c048b9306555ccbdb97eaf7922624664b0eb1 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Fri, 2 Feb 2007 17:23:11 +0100 Subject: [ALSA] soc - ASoC 0.13 Sharp tosa machine This patch updates the Sharp tosa machine driver to the new API in ASoC 0.13. Changes:- o Update machine operations to new API. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/soc/pxa/tosa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 8c3c6b0534d..5504e30acf1 100644 --- a/sound/soc/pxa/tosa.c +++ b/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,12 +229,14 @@ 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, }, }; @@ -241,7 +244,6 @@ 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 = { -- cgit v1.2.3