ASoC: Rename snd_soc_card to snd_soc_machine

[pandora-kernel.git] / sound / soc / atmel / sam9g20_wm8731.c

diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 710addc..fdc1d02 100644 (file)
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -242,7 +242,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
        .ops = &at91sam9g20ek_ops,
 };
 
-static struct snd_soc_machine snd_soc_machine_at91sam9g20ek = {
+static struct snd_soc_card snd_soc_at91sam9g20ek = {
        .name = "WM8731",
        .dai_link = &at91sam9g20ek_dai,
        .num_links = 1,
@@ -254,7 +254,7 @@ static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = {
 };
 
 static struct snd_soc_device at91sam9g20ek_snd_devdata = {
-       .machine = &snd_soc_machine_at91sam9g20ek,
+       .card = &snd_soc_at91sam9g20ek,
        .platform = &atmel_soc_platform,
        .codec_dev = &soc_codec_dev_wm8731,
        .codec_data = &at91sam9g20ek_wm8731_setup,