diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 16:17:10 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 16:17:10 -0500 |
| commit | a9037430c6c784165a940a90bcd29f886834c8e7 (patch) | |
| tree | 4b186e0a761e93a6c6712053d444b566c0d25338 /sound/soc/codecs/wm5102.c | |
| parent | 6125bc8b86d9da75ddac77e38f41afbf9f5de3e3 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' into timers/core
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
| -rw-r--r-- | sound/soc/codecs/wm5102.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 7a9048dad1cd..1440b3f9b7bb 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
| @@ -896,8 +896,7 @@ static const unsigned int wm5102_aec_loopback_values[] = { | |||
| 896 | 896 | ||
| 897 | static const struct soc_enum wm5102_aec_loopback = | 897 | static const struct soc_enum wm5102_aec_loopback = |
| 898 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, | 898 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, |
| 899 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, | 899 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf, |
| 900 | ARIZONA_AEC_LOOPBACK_SRC_MASK, | ||
| 901 | ARRAY_SIZE(wm5102_aec_loopback_texts), | 900 | ARRAY_SIZE(wm5102_aec_loopback_texts), |
| 902 | wm5102_aec_loopback_texts, | 901 | wm5102_aec_loopback_texts, |
| 903 | wm5102_aec_loopback_values); | 902 | wm5102_aec_loopback_values); |