diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-10 09:58:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-10 09:58:17 -0400 |
| commit | 0f3c6af92100193cf9a86bdd0ee35e6da3e0c56e (patch) | |
| tree | 822dc06315ce23713daa8d1baa9c3266cc026947 /sound/soc | |
| parent | 1209842af4db98ffd7364ec9cf7d1a59293aa74c (diff) | |
| parent | 61bf35b9a3eab961ee1249467d9b2ac11d3c34c1 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index f3cab8491431..957cd66177d6 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
| @@ -699,7 +699,7 @@ SOC_ENUM("DRC Smoothing Threshold", drc_smoothing), | |||
| 699 | SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup), | 699 | SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup), |
| 700 | 700 | ||
| 701 | SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, | 701 | SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, |
| 702 | WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 96, 0, digital_tlv), | 702 | WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv), |
| 703 | SOC_ENUM("ADC Companding Mode", adc_companding), | 703 | SOC_ENUM("ADC Companding Mode", adc_companding), |
| 704 | SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0), | 704 | SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0), |
| 705 | 705 | ||