diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:11 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:11 (GMT) |
| commit | d48fb4232de0f8a9db7475200663095ef536efff (patch) | |
| tree | 87f5ccbdd943dd2c9de912114470dfad63f676c7 /sound/soc | |
| parent | 27e9a69759b475200653ad16ef1e7dde5ee1cf56 (diff) | |
| parent | 5be9c5b477bd3eda6bbe0f6e3431da45c3fd28f4 (diff) | |
| download | linux-d48fb4232de0f8a9db7475200663095ef536efff.tar.xz | |
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 3470b64..0a3c7f7 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -279,7 +279,7 @@ static const struct soc_enum wm_adsp2_rate_enum[] = { ARIZONA_DSP1_RATE_SHIFT, 0xf, ARIZONA_RATE_ENUM_SIZE, arizona_rate_text, arizona_rate_val), - SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1, + SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1, ARIZONA_DSP1_RATE_SHIFT, 0xf, ARIZONA_RATE_ENUM_SIZE, arizona_rate_text, arizona_rate_val), |