diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 11:28:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 11:28:19 +0000 |
| commit | 70a28f841d6744c53320c789c2603ac4318649b2 (patch) | |
| tree | d741cae5dc81bc37bbb05134a453cd099262dac5 /sound/soc/codecs/wm_hubs.c | |
| parent | 5786b6622112ab582c0bf05d6e722ed12a07642f (diff) | |
| parent | 1d9a91db923d73707538121b65f4e24e91dcbd2d (diff) | |
| download | lwn-70a28f841d6744c53320c789c2603ac4318649b2.tar.gz lwn-70a28f841d6744c53320c789c2603ac4318649b2.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index f98170e3eb89..bde0e84e8214 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -40,7 +40,7 @@ static const DECLARE_TLV_DB_SCALE(outmix_tlv, -2100, 300, 0); static const DECLARE_TLV_DB_SCALE(spkmixout_tlv, -1800, 600, 1); static const DECLARE_TLV_DB_SCALE(outpga_tlv, -5700, 100, 0); static const unsigned int spkboost_tlv[] = { - TLV_DB_RANGE_HEAD(7), + TLV_DB_RANGE_HEAD(2), 0, 6, TLV_DB_SCALE_ITEM(0, 150, 0), 7, 7, TLV_DB_SCALE_ITEM(1200, 0, 0), }; |