diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 02:17:30 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 02:17:30 +0100 |
commit | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch) | |
tree | 8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/wm8904.c | |
parent | ASoC: Disable thermal shutdown when not using speakers in wm_hubs (diff) | |
parent | ASoC: Ensure we get an impedence reported for WM8958 jack detect (diff) | |
download | linux-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.tar.xz linux-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.zip |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index bf325bb12d77..bb070f835257 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), |