diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 10:20:30 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 10:20:30 -0500 |
| commit | ac5f1ad34981780921625e78d8316c35b3723c81 (patch) | |
| tree | 12e38e6de388f79123514f992cb10ace9d6c5f21 | |
| parent | bdbe9c72f65fde0faa415c1a8fc8a555367c6e9e (diff) | |
| parent | 3d800c6d75b8c92fa928a0bcaf95cd7ac5fd1ce5 (diff) | |
Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus
| -rw-r--r-- | sound/soc/codecs/cs42l52.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h index 4277012c4719..a935d7381af6 100644 --- a/sound/soc/codecs/cs42l52.h +++ b/sound/soc/codecs/cs42l52.h | |||
| @@ -179,7 +179,7 @@ | |||
| 179 | #define CS42L52_MICB_CTL 0x11 | 179 | #define CS42L52_MICB_CTL 0x11 |
| 180 | #define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF | 180 | #define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF |
| 181 | #define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6 | 181 | #define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6 |
| 182 | #define CS42L52_MIC_CTL_TYPE_MASK 0xDF | 182 | #define CS42L52_MIC_CTL_TYPE_MASK 0x20 |
| 183 | #define CS42L52_MIC_CTL_TYPE_SHIFT 5 | 183 | #define CS42L52_MIC_CTL_TYPE_SHIFT 5 |
| 184 | 184 | ||
| 185 | 185 | ||