dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'for-2.6.29' into for-2.6.30

This commit is contained in:
Mark Brown 2009-02-10 21:37:01 +00:00
parent 7565fc38cc 272edb0049
commit 9e32ebdb3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/omap/sdp3430.c
View File

@ -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,
};