summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-26 11:29:55 +0000
committerMark Brown <broonie@kernel.org>2015-01-26 11:29:55 +0000
commita9bb437ab0232f126626604d75785955a5f4fbcc (patch)
treeb9584ca5044bf8e3f168cd05ef5e809247c6450d /sound
parentd9b35aa056e015a78adbb0b393a0082c931d84dd (diff)
parent3a8e5019846736046c0af9dbee3f921c0456141a (diff)
downloadop-kernel-dev-a9bb437ab0232f126626604d75785955a5f4fbcc.zip
op-kernel-dev-a9bb437ab0232f126626604d75785955a5f4fbcc.tar.gz
Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/pcm512x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index e5f2fb8..30c673c 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);
static const char * const pcm512x_dsp_program_texts[] = {
"FIR interpolation with de-emphasis",
"Low latency IIR with de-emphasis",
- "Fixed process flow",
"High attenuation with de-emphasis",
+ "Fixed process flow",
"Ringing-less low latency FIR",
};
OpenPOWER on IntegriCloud