Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.7

Nothing too exciting except for the ams-delta change which is relatively
lerge due to the fact that the driver loading had been totally broken as
the driver needed a newer API to function.

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 5dc10dfc0d42..b0d46d63d55e 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -212,7 +212,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
         {
                 .name = "Sub",
                 .stream_name = "Sub",
-                .cpu_dai_name = "wm5102-aif3",
+                .cpu_dai_name = "wm5110-aif3",
                 .codec_dai_name = "wm9081-hifi",
                 .codec_name = "wm9081.1-006c",
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
@@ -247,7 +247,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
         {
                 .name = "Sub",
                 .stream_name = "Sub",
-                .cpu_dai_name = "wm5102-aif3",
+                .cpu_dai_name = "wm5110-aif3",
                 .codec_dai_name = "wm9081-hifi",
                 .codec_name = "wm9081.1-006c",
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF