diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-08 05:45:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-08 05:45:09 -0400 |
| commit | b727916a1f79f7a6e4603747b36a51777cb074e0 (patch) | |
| tree | 58e9386a8b120a55678950d4465e85d05f1a9b34 /sound/soc/codecs/wm8350.c | |
| parent | 907bc6c7fc7071b00083fc11e510e47dd93df45d (diff) | |
| parent | 6f775ba0154cdf10108071acc71f26c4efdb8d57 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3f7e8a8b387..72abc5a6d8d 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
| @@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = { | |||
| 579 | SOC_DAPM_SINGLE_TLV("L3 Capture Volume", | 579 | SOC_DAPM_SINGLE_TLV("L3 Capture Volume", |
| 580 | WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv), | 580 | WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv), |
| 581 | SOC_DAPM_SINGLE("PGA Capture Switch", | 581 | SOC_DAPM_SINGLE("PGA Capture Switch", |
| 582 | WM8350_LEFT_INPUT_VOLUME, 14, 1, 0), | 582 | WM8350_LEFT_INPUT_VOLUME, 14, 1, 1), |
| 583 | }; | 583 | }; |
| 584 | 584 | ||
| 585 | /* Right Input Mixer */ | 585 | /* Right Input Mixer */ |
| @@ -589,7 +589,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = { | |||
| 589 | SOC_DAPM_SINGLE_TLV("L3 Capture Volume", | 589 | SOC_DAPM_SINGLE_TLV("L3 Capture Volume", |
| 590 | WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv), | 590 | WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv), |
| 591 | SOC_DAPM_SINGLE("PGA Capture Switch", | 591 | SOC_DAPM_SINGLE("PGA Capture Switch", |
| 592 | WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0), | 592 | WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1), |
| 593 | }; | 593 | }; |
| 594 | 594 | ||
| 595 | /* Left Mic Mixer */ | 595 | /* Left Mic Mixer */ |