ASoC: Rename snd_soc_card to snd_soc_machine

[pandora-kernel.git] / sound / soc / davinci / davinci-sffsdr.c

diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index 69a8a76..fa38f9c 100644 (file)
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -73,7 +73,7 @@ static struct snd_soc_dai_link sffsdr_dai = {
 };
 
 /* davinci-sffsdr audio machine driver */
-static struct snd_soc_machine snd_soc_machine_sffsdr = {
+static struct snd_soc_card snd_soc_sffsdr = {
        .name = "DaVinci SFFSDR",
        .dai_link = &sffsdr_dai,
        .num_links = 1,
@@ -89,7 +89,7 @@ static struct pcm3008_setup_data sffsdr_pcm3008_setup = {
 
 /* sffsdr audio subsystem */
 static struct snd_soc_device sffsdr_snd_devdata = {
-       .machine = &snd_soc_machine_sffsdr,
+       .card = &snd_soc_sffsdr,
        .platform = &davinci_soc_platform,
        .codec_dev = &soc_codec_dev_pcm3008,
        .codec_data = &sffsdr_pcm3008_setup,