Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index ad97836818b1..e226fa75669c 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -91,7 +91,7 @@ static struct snd_soc_dai_link sdp3430_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_sdp3430 = {
+static struct snd_soc_card snd_soc_sdp3430 = {
         .name = "SDP3430",
         .platform = &omap_soc_platform,
         .dai_link = &sdp3430_dai,
@@ -100,7 +100,7 @@ static struct snd_soc_machine snd_soc_machine_sdp3430 = {
 
 /* Audio subsystem */
 static struct snd_soc_device sdp3430_snd_devdata = {
-        .machine = &snd_soc_machine_sdp3430,
+        .card = &snd_soc_sdp3430,
         .codec_dev = &soc_codec_dev_twl4030,
 };