diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-26 06:29:55 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-26 06:29:55 -0500 |
commit | a9bb437ab0232f126626604d75785955a5f4fbcc (patch) | |
tree | b9584ca5044bf8e3f168cd05ef5e809247c6450d /sound/soc | |
parent | d9b35aa056e015a78adbb0b393a0082c931d84dd (diff) | |
parent | 3a8e5019846736046c0af9dbee3f921c0456141a (diff) |
Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/pcm512x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index e5f2fb884bf3..30c673cdc12e 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c | |||
@@ -188,8 +188,8 @@ static const DECLARE_TLV_DB_SCALE(boost_tlv, 0, 80, 0); | |||
188 | static const char * const pcm512x_dsp_program_texts[] = { | 188 | static const char * const pcm512x_dsp_program_texts[] = { |
189 | "FIR interpolation with de-emphasis", | 189 | "FIR interpolation with de-emphasis", |
190 | "Low latency IIR with de-emphasis", | 190 | "Low latency IIR with de-emphasis", |
191 | "Fixed process flow", | ||
192 | "High attenuation with de-emphasis", | 191 | "High attenuation with de-emphasis", |
192 | "Fixed process flow", | ||
193 | "Ringing-less low latency FIR", | 193 | "Ringing-less low latency FIR", |
194 | }; | 194 | }; |
195 | 195 | ||