Merge branch 'for-2.6.29' into for-2.6.30
This commit is contained in:
commit
9e32ebdb3a
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue