| Message ID | 2C7D3DF36ADFFC479B44490D912B616705D6175435@dlee07.ent.ti.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On Tue, 10 Feb 2009 09:05:07 +0100 "ext Lopez Cruz, Misael" <x0052729@ti.com> wrote: > This patch replaces "snd_soc_machine" structure by "snd_soc_card" in > SP3430 driver. This change is needed in SDP3430 driver to reflect > changes introduced by "ASoC: Rename snd_soc_card to snd_soc_machine" > patch (875065491fba8eb13219f16c36e79a6fb4e15c68). > > Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> > --- > sound/soc/omap/sdp3430.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > IMO, this is for 2.6.29-rc since it fixes a compilation error. Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 10, 2009 at 11:41:59AM +0200, Jarkko Nikula wrote: > > SP3430 driver. This change is needed in SDP3430 driver to reflect > > changes introduced by "ASoC: Rename snd_soc_card to snd_soc_machine" > > patch (875065491fba8eb13219f16c36e79a6fb4e15c68). Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index ad97836..e226fa7 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, };
This patch replaces "snd_soc_machine" structure by "snd_soc_card" in SP3430 driver. This change is needed in SDP3430 driver to reflect changes introduced by "ASoC: Rename snd_soc_card to snd_soc_machine" patch (875065491fba8eb13219f16c36e79a6fb4e15c68). Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> --- sound/soc/omap/sdp3430.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)