diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /sound/soc/codecs/wm8993.c | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index cd2bc05f78cc..828d8174d5b7 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
| @@ -691,7 +691,7 @@ SOC_DOUBLE_TLV("Digital Sidetone Volume", WM8993_DIGITAL_SIDE_TONE, | |||
| 691 | 691 | ||
| 692 | SOC_SINGLE("DRC Switch", WM8993_DRC_CONTROL_1, 15, 1, 0), | 692 | SOC_SINGLE("DRC Switch", WM8993_DRC_CONTROL_1, 15, 1, 0), |
| 693 | SOC_ENUM("DRC Path", drc_path), | 693 | SOC_ENUM("DRC Path", drc_path), |
| 694 | SOC_SINGLE_TLV("DRC Compressor Threashold Volume", WM8993_DRC_CONTROL_2, | 694 | SOC_SINGLE_TLV("DRC Compressor Threshold Volume", WM8993_DRC_CONTROL_2, |
| 695 | 2, 60, 1, drc_comp_threash), | 695 | 2, 60, 1, drc_comp_threash), |
| 696 | SOC_SINGLE_TLV("DRC Compressor Amplitude Volume", WM8993_DRC_CONTROL_3, | 696 | SOC_SINGLE_TLV("DRC Compressor Amplitude Volume", WM8993_DRC_CONTROL_3, |
| 697 | 11, 30, 1, drc_comp_amp), | 697 | 11, 30, 1, drc_comp_amp), |
| @@ -711,7 +711,7 @@ SOC_SINGLE_TLV("DRC Quick Release Volume", WM8993_DRC_CONTROL_3, 2, 3, 0, | |||
| 711 | SOC_ENUM("DRC Quick Release Rate", drc_qr_rate), | 711 | SOC_ENUM("DRC Quick Release Rate", drc_qr_rate), |
| 712 | SOC_SINGLE("DRC Smoothing Switch", WM8993_DRC_CONTROL_1, 11, 1, 0), | 712 | SOC_SINGLE("DRC Smoothing Switch", WM8993_DRC_CONTROL_1, 11, 1, 0), |
| 713 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8993_DRC_CONTROL_1, 8, 1, 0), | 713 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8993_DRC_CONTROL_1, 8, 1, 0), |
| 714 | SOC_ENUM("DRC Smoothing Hysteresis Threashold", drc_smooth), | 714 | SOC_ENUM("DRC Smoothing Hysteresis Threshold", drc_smooth), |
| 715 | SOC_SINGLE_TLV("DRC Startup Volume", WM8993_DRC_CONTROL_4, 8, 18, 0, | 715 | SOC_SINGLE_TLV("DRC Startup Volume", WM8993_DRC_CONTROL_4, 8, 18, 0, |
| 716 | drc_startup_tlv), | 716 | drc_startup_tlv), |
| 717 | 717 | ||