diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 21:07:58 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 21:07:58 +0200 |
| commit | 70268992c575948147c0e9c71d1e1ee0517a16ed (patch) | |
| tree | 6afda549de3bd5f3f5a93dff9be900c89bba0d07 /sound/soc | |
| parent | 8a229ae2d652b42437863787cfc28f7f8a78a35d (diff) | |
| parent | 85ce02207e7728d82cc6183d34c2bdd9e1999b2e (diff) | |
| download | kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.zip kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.tar.gz kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.tar.bz2 | |
Merge commit '85ce022' into HEAD
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 90e5005..520a20e 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -144,7 +144,7 @@ SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0), SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1), SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1), -SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1), +SOC_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1), SOC_ENUM("Capture Volume Steps", wm9712_enum[6]), SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 1), SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0), |