diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:45 +0100 |
| commit | 6791142f41dc3a92a589f66c0af2db7e5fd572a1 (patch) | |
| tree | d2f8249a7b6b935f0e344314bb6a7f94612e5727 /sound/soc/codecs/wm_adsp.h | |
| parent | 25305dcf5de52fe48437c46dd4d15d1e87b9fbee (diff) | |
| parent | 336d0442b9f03a0389baaf09e39880fdd1873cc3 (diff) | |
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index 5042cbd39e54..579a6350fb01 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -83,7 +83,7 @@ struct wm_adsp { #define WM_ADSP2(wname, num) \ WM_ADSP2_E(wname, num, wm_adsp2_early_event) -extern const struct snd_kcontrol_new wm_adsp1_fw_controls[]; +extern const struct snd_kcontrol_new wm_adsp_fw_controls[]; int wm_adsp1_init(struct wm_adsp *dsp); int wm_adsp2_init(struct wm_adsp *dsp); |