summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8904.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 01:17:30 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 01:17:30 +0000
commit4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch)
tree8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/wm8904.c
parent03431972ac16bbfcbfb831bb37c419f8f71bf16d (diff)
parent19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (diff)
downloadop-kernel-dev-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.zip
op-kernel-dev-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.tar.gz
Merge branch 'for-3.2' into for-3.3
Conflicts: sound/soc/codecs/wm8940.c
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
-rw-r--r--sound/soc/codecs/wm8904.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index bf325bb..bb070f83 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -867,7 +867,7 @@ SOC_ENUM("Right Capture Mode", rin_mode),
SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0,
WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0),
SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,
- WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0),
+ WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1),
SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),
SOC_ENUM("High Pass Filter Mode", hpf_mode),
OpenPOWER on IntegriCloud