summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm_adsp.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 16:56:53 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 16:56:53 +0400
commita18d5151aae8f18c14592528d8190441385955e9 (patch)
tree0b8cb2a37eb491e4dd5e246dd75ddd03efc85f3d /sound/soc/codecs/wm_adsp.h
parent0680fa6c25d283d218cbb7760083c0d7ffb6d31c (diff)
parentb6ed61cfa24786e36164869b593d44d411a700ad (diff)
downloadlinux-a18d5151aae8f18c14592528d8190441385955e9.tar.xz
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm_adsp.h')
-rw-r--r--sound/soc/codecs/wm_adsp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index d6fd8af53b5d..fea514627526 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -67,7 +67,8 @@ struct wm_adsp {
.shift = num, .event = wm_adsp2_event, \
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
-extern const struct snd_kcontrol_new wm_adsp_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];
int wm_adsp1_init(struct wm_adsp *adsp);
int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs);