summaryrefslogtreecommitdiff
path: root/sound/soc/omap/ams-delta.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 15:33:59 +0400
committerOlof Johansson <olof@lixom.net>2012-03-28 02:18:19 +0400
commita754a87ce8b17024358c1be8ee0232ef09a7055f (patch)
treec0d4adee8f490828ca04cd45d6fbb13596d88322 /sound/soc/omap/ams-delta.c
parent70688056a8b4d610249716befe262a74fd123d90 (diff)
parent22f8d055350066b4a87de4adea8c5213cac54534 (diff)
downloadlinux-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.xz
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/omap/ams-delta.c')
-rw-r--r--sound/soc/omap/ams-delta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index f610260065ba..41586b26ce90 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -544,7 +544,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_disable_pin(dapm, "AGCOUT");
/* Add virtual switch */
- ret = snd_soc_add_controls(codec, ams_delta_audio_controls,
+ ret = snd_soc_add_codec_controls(codec, ams_delta_audio_controls,
ARRAY_SIZE(ams_delta_audio_controls));
if (ret)
dev_warn(card->dev,