diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-19 14:49:22 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-19 14:49:22 -0400 |
| commit | 4bb762056f4dff29fe66d0735b709475b5a28b9f (patch) | |
| tree | 87f5ccbdd943dd2c9de912114470dfad63f676c7 | |
| parent | 5b32f794b3bab4f9cad1290b505450515d4558e9 (diff) | |
| parent | 5be9c5b477bd3eda6bbe0f6e3431da45c3fd28f4 (diff) | |
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus
| -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 3470b649c0b2..0a3c7f704016 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[] = { | |||
| 279 | ARIZONA_DSP1_RATE_SHIFT, 0xf, | 279 | ARIZONA_DSP1_RATE_SHIFT, 0xf, |
| 280 | ARIZONA_RATE_ENUM_SIZE, | 280 | ARIZONA_RATE_ENUM_SIZE, |
| 281 | arizona_rate_text, arizona_rate_val), | 281 | arizona_rate_text, arizona_rate_val), |
| 282 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1, | 282 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1, |
| 283 | ARIZONA_DSP1_RATE_SHIFT, 0xf, | 283 | ARIZONA_DSP1_RATE_SHIFT, 0xf, |
| 284 | ARIZONA_RATE_ENUM_SIZE, | 284 | ARIZONA_RATE_ENUM_SIZE, |
| 285 | arizona_rate_text, arizona_rate_val), | 285 | arizona_rate_text, arizona_rate_val), |