diff options
| author | Mark Brown | 2009-02-10 22:37:01 +0100 |
|---|---|---|
| committer | Mark Brown | 2009-02-10 22:37:01 +0100 |
| commit | 9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9 (patch) | |
| tree | cf7801c1c03182ab8306874e494d2dddeec0cb8d /sound/soc | |
| parent | ASoC: TLV320AIC3X: Add TLV information for volume controls (diff) | |
| parent | ASoC: Update SDP3430 machine driver for snd_soc_card (diff) | |
| download | kernel-qcow2-linux-9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9.tar.gz kernel-qcow2-linux-9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9.tar.xz kernel-qcow2-linux-9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9.zip | |
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/sdp3430.c | 4 |
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, }; |