diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:20 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:20 +0300 |
commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/codecs/ml26124.c | |
parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
download | linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.xz |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/codecs/ml26124.c')
-rw-r--r-- | sound/soc/codecs/ml26124.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 3abd27893ce6..55823bc95d06 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -56,7 +56,6 @@ static const DECLARE_TLV_DB_SCALE(alclvl, -2250, 150, 0); static const DECLARE_TLV_DB_SCALE(mingain, -1200, 600, 0); static const DECLARE_TLV_DB_SCALE(maxgain, -675, 600, 0); static const DECLARE_TLV_DB_SCALE(boost_vol, -1200, 75, 0); -static const DECLARE_TLV_DB_SCALE(ngth, -7650, 150, 0); static const char * const ml26124_companding[] = {"16bit PCM", "u-law", "A-law"}; |