From 09c90145ba895552096a9a5d67a0716ae984eaea Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Feb 2009 21:37:01 +0000
Subject: [PATCH] --- yaml --- r: 132835 b: refs/heads/master c:
 9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9 h: refs/heads/master i:   132833:
 c178b2116aa27db7d68247770ff181846baa0bf1   132831:
 e0f880bd78d760298189b63134f7e60858f39e5a v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/omap/sdp3430.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2502308c0ccf..99daaee6fb55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7565fc38cc8c3a2742d63e957199d70a82d2faf1
+refs/heads/master: 9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9
diff --git a/trunk/sound/soc/omap/sdp3430.c b/trunk/sound/soc/omap/sdp3430.c
index ad97836818b1..e226fa75669c 100644
--- a/trunk/sound/soc/omap/sdp3430.c
+++ b/trunk/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,
 };