diff options
| author | Mark Brown | 2010-12-06 15:14:47 +0100 |
|---|---|---|
| committer | Mark Brown | 2010-12-06 15:14:47 +0100 |
| commit | 0afc8c733e95642ee9200966081da82564af8f8f (patch) | |
| tree | 01dfd20489e9cec42f43bc0588cf82989fcc132e /sound/soc/codecs/wm_hubs.c | |
| parent | ASoC: soc-cache: Add optional cache name member to snd_soc_cache_ops (diff) | |
| parent | ASoC: Hold client_mutex while calling snd_soc_instantiate_cards() (diff) | |
| download | kernel-qcow2-linux-0afc8c733e95642ee9200966081da82564af8f8f.tar.gz kernel-qcow2-linux-0afc8c733e95642ee9200966081da82564af8f8f.tar.xz kernel-qcow2-linux-0afc8c733e95642ee9200966081da82564af8f8f.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
include/linux/mfd/wm8994/pdata.h
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 b24ba9fa7ef7..c466982eed23 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -323,7 +323,7 @@ SOC_DOUBLE_R("Speaker Switch", SOC_DOUBLE_R("Speaker ZC Switch", WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT, 7, 1, 0), -SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 0, 3, 7, 0, +SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 3, 0, 7, 0, spkboost_tlv), SOC_ENUM("Speaker Reference", speaker_ref), SOC_ENUM("Speaker Mode", speaker_mode), |