aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-10 21:37:01 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-10 21:37:01 +0000
commit9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9 (patch)
treecf7801c1c03182ab8306874e494d2dddeec0cb8d
parent7565fc38cc8c3a2742d63e957199d70a82d2faf1 (diff)
parent272edb00493af32c609f43bdf1d75141756fd999 (diff)
Merge branch 'for-2.6.29' into for-2.6.30
-rw-r--r--sound/soc/omap/sdp3430.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index ad97836818b..e226fa75669 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,
};