diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:45 +0300 |
| commit | 6791142f41dc3a92a589f66c0af2db7e5fd572a1 (patch) | |
| tree | d2f8249a7b6b935f0e344314bb6a7f94612e5727 /sound/soc/codecs/wm2200.c | |
| parent | 25305dcf5de52fe48437c46dd4d15d1e87b9fbee (diff) | |
| parent | 336d0442b9f03a0389baaf09e39880fdd1873cc3 (diff) | |
| download | linux-6791142f41dc3a92a589f66c0af2db7e5fd572a1.tar.xz | |
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm2200.c')
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 5a9da28f4f33..c83083285e53 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1555,7 +1555,7 @@ static int wm2200_probe(struct snd_soc_codec *codec) wm2200->codec = codec; - ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2); + ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 2); if (ret != 0) return ret; |