Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

[linux-2.6-omap-h63xx.git] / sound / soc / sh / sh7760-ac97.c

diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c
index 92bfaf4774a7d05fec84bf270539c8be09a6b05d..ce7f95b59de32aa3efe58bd46389ecb1d0b98c5e 100644 (file)
--- a/sound/soc/sh/sh7760-ac97.c
+++ b/sound/soc/sh/sh7760-ac97.c
@@ -38,15 +38,15 @@ static struct snd_soc_dai_link sh7760_ac97_dai = {
        .ops = NULL,
 };
 
-static struct snd_soc_machine sh7760_ac97_soc_machine  = {
+static struct snd_soc_card sh7760_ac97_soc_machine  = {
        .name = "SH7760 AC97",
+       .platform = &sh7760_soc_platform,
        .dai_link = &sh7760_ac97_dai,
        .num_links = 1,
 };
 
 static struct snd_soc_device sh7760_ac97_snd_devdata = {
-       .machine = &sh7760_ac97_soc_machine,
-       .platform = &sh7760_soc_platform,
+       .card = &sh7760_ac97_soc_machine,
        .codec_dev = &soc_codec_dev_ac97,
 };