ASoC: Rename snd_soc_card to snd_soc_machine

[safe/jmp/linux-2.6] / sound / soc / omap / omap2evm.c

diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c
index c376213..5bea311 100644 (file)
--- a/sound/soc/omap/omap2evm.c
+++ b/sound/soc/omap/omap2evm.c
@@ -90,7 +90,7 @@ static struct snd_soc_dai_link omap2evm_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_omap2evm = {
+static struct snd_soc_card snd_soc_omap2evm = {
        .name = "omap2evm",
        .dai_link = &omap2evm_dai,
        .num_links = 1,
@@ -98,7 +98,7 @@ static struct snd_soc_machine snd_soc_machine_omap2evm = {
 
 /* Audio subsystem */
 static struct snd_soc_device omap2evm_snd_devdata = {
-       .machine = &snd_soc_machine_omap2evm,
+       .card = &snd_soc_omap2evm,
        .platform = &omap_soc_platform,
        .codec_dev = &soc_codec_dev_twl4030,
 };