diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /sound/soc/codecs/wm8993.c | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index eec8e1435116..d1a142f48b09 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
| @@ -512,7 +512,7 @@ static const DECLARE_TLV_DB_SCALE(drc_comp_threash, -4500, 75, 0); | |||
| 512 | static const DECLARE_TLV_DB_SCALE(drc_comp_amp, -2250, 75, 0); | 512 | static const DECLARE_TLV_DB_SCALE(drc_comp_amp, -2250, 75, 0); |
| 513 | static const DECLARE_TLV_DB_SCALE(drc_min_tlv, -1800, 600, 0); | 513 | static const DECLARE_TLV_DB_SCALE(drc_min_tlv, -1800, 600, 0); |
| 514 | static const unsigned int drc_max_tlv[] = { | 514 | static const unsigned int drc_max_tlv[] = { |
| 515 | TLV_DB_RANGE_HEAD(4), | 515 | TLV_DB_RANGE_HEAD(2), |
| 516 | 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0), | 516 | 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0), |
| 517 | 3, 3, TLV_DB_SCALE_ITEM(3600, 0, 0), | 517 | 3, 3, TLV_DB_SCALE_ITEM(3600, 0, 0), |
| 518 | }; | 518 | }; |