summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm_hubs.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-06 14:14:47 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-06 14:14:47 +0000
commit0afc8c733e95642ee9200966081da82564af8f8f (patch)
tree01dfd20489e9cec42f43bc0588cf82989fcc132e /sound/soc/codecs/wm_hubs.c
parent0d735eaa2c1d80c997fd775b679e36b80b8e85d1 (diff)
parent1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index b24ba9fa7ef..c466982eed2 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),