5 files changed, 10 insertions, 10 deletions

diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index fae3ad36e0bf..d216b4f9e14e 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -282,7 +282,7 @@ static struct snd_soc_dai_link n810_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_n810 = {
+static struct snd_soc_card snd_soc_n810 = {
         .name = "N810",
         .dai_link = &n810_dai,
         .num_links = 1,
@@ -298,7 +298,7 @@ static struct aic3x_setup_data n810_aic33_setup = {
 
 /* Audio subsystem */
 static struct snd_soc_device n810_snd_devdata = {
-        .machine = &snd_soc_machine_n810,
+        .card = &snd_soc_n810,
         .platform = &omap_soc_platform,
         .codec_dev = &soc_codec_dev_aic3x,
         .codec_data = &n810_aic33_setup,
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c
index c37621357d00..5bea31157a94 100644
--- 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,
 };
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index ec84a9bbc563..3ed25464627f 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -88,7 +88,7 @@ static struct snd_soc_dai_link omap3beagle_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_omap3beagle = {
+static struct snd_soc_card snd_soc_omap3beagle = {
         .name = "omap3beagle",
         .dai_link = &omap3beagle_dai,
         .num_links = 1,
@@ -96,7 +96,7 @@ static struct snd_soc_machine snd_soc_machine_omap3beagle = {
 
 /* Audio subsystem */
 static struct snd_soc_device omap3beagle_snd_devdata = {
-        .machine = &snd_soc_machine_omap3beagle,
+        .card = &snd_soc_omap3beagle,
         .platform = &omap_soc_platform,
         .codec_dev = &soc_codec_dev_twl4030,
 };
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 0fe733796898..7a8f14d0c772 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -143,7 +143,7 @@ static struct snd_soc_dai_link osk_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_osk = {
+static struct snd_soc_card snd_soc_card_osk = {
         .name = "OSK5912",
         .dai_link = &osk_dai,
         .num_links = 1,
@@ -151,7 +151,7 @@ static struct snd_soc_machine snd_soc_machine_osk = {
 
 /* Audio subsystem */
 static struct snd_soc_device osk_snd_devdata = {
-        .machine = &snd_soc_machine_osk,
+        .card = &snd_soc_card_osk,
         .platform = &omap_soc_platform,
         .codec_dev = &soc_codec_dev_tlv320aic23,
 };
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
index c26d1de7da51..eea0c372bb3f 100644
--- a/sound/soc/omap/overo.c
+++ b/sound/soc/omap/overo.c
@@ -88,7 +88,7 @@ static struct snd_soc_dai_link overo_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_overo = {
+static struct snd_soc_card snd_soc_card_overo = {
         .name = "overo",
         .dai_link = &overo_dai,
         .num_links = 1,
@@ -96,7 +96,7 @@ static struct snd_soc_machine snd_soc_machine_overo = {
 
 /* Audio subsystem */
 static struct snd_soc_device overo_snd_devdata = {
-        .machine = &snd_soc_machine_overo,
+        .card = &snd_soc_card_overo,
         .platform = &omap_soc_platform,
         .codec_dev = &soc_codec_dev_twl4030,
 };