diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:53 +0100 |
| commit | a18d5151aae8f18c14592528d8190441385955e9 (patch) | |
| tree | 0b8cb2a37eb491e4dd5e246dd75ddd03efc85f3d /sound/soc/codecs/wm_adsp.h | |
| parent | 0680fa6c25d283d218cbb7760083c0d7ffb6d31c (diff) | |
| parent | b6ed61cfa24786e36164869b593d44d411a700ad (diff) | |
| download | linux-3.10-a18d5151aae8f18c14592528d8190441385955e9.tar.gz linux-3.10-a18d5151aae8f18c14592528d8190441385955e9.tar.bz2 linux-3.10-a18d5151aae8f18c14592528d8190441385955e9.zip | |
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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index d6fd8af53b5..fea51462752 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); |