summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/lm4857.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 12:33:59 +0100
committerOlof Johansson <olof@lixom.net>2012-03-28 00:18:19 +0200
commita754a87ce8b17024358c1be8ee0232ef09a7055f (patch)
treec0d4adee8f490828ca04cd45d6fbb13596d88322 /sound/soc/codecs/lm4857.c
parentMerge branch 'for-3.4/boards' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentASoC: wm8994: Provide VMID mode control and fix default sequence (diff)
downloadlinux-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.xz
linux-a754a87ce8b17024358c1be8ee0232ef09a7055f.zip
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some board-level changes that conflict with patches we already have here, so pull in that branch to resolve the conflicts. Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c arch/arm/mach-omap2/board-omap4panda.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended fix for mismerge as reported by Kevin Hilman] Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound/soc/codecs/lm4857.c')
-rw-r--r--sound/soc/codecs/lm4857.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c
index 319039240e0f..ba4fafb93e56 100644
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -179,7 +179,7 @@ static int lm4857_probe(struct snd_soc_codec *codec)
codec->control_data = lm4857->i2c;
- ret = snd_soc_add_controls(codec, lm4857_controls,
+ ret = snd_soc_add_codec_controls(codec, lm4857_controls,
ARRAY_SIZE(lm4857_controls));
if (ret)
return ret;