From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 5 Sep 2012 12:05:11 +0000 (+0800)
Subject: Merge branch 'asoc-omap' into for-3.7
X-Git-Tag: MMI-PSA29.97-13-9~15510^2~52^2~136
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75d8f2931a803b803cb4a850448460475c20f30b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'asoc-omap' into for-3.7
---

75d8f2931a803b803cb4a850448460475c20f30b
diff --cc sound/soc/codecs/wm9712.c
index 6aa1bf8c6897,c6d2076a796b..1992a6295a16
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@@ -147,9 -146,9 +147,9 @@@ SOC_SINGLE("Playback Attenuate (-6dB) S
  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_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 0),
  SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
  
  SOC_SINGLE_TLV("Mic 1 Volume", AC97_MIC, 8, 31, 1, main_tlv),