diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-12 15:33:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-12 15:33:51 -0500 |
| commit | 8688a1a8637c6b833b9b70148809db4538352d2e (patch) | |
| tree | 7b5d6c2d83c8bd1686811501c6287a650c40751b /sound/soc/codecs/wm8903.h | |
| parent | 3afdb0f3528991de0833224f2dba60dc061e01fa (diff) | |
| parent | f91f9cd505f92e4227ffda7e5799a33d4f34bf36 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
Diffstat (limited to 'sound/soc/codecs/wm8903.h')
| -rw-r--r-- | sound/soc/codecs/wm8903.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.h b/sound/soc/codecs/wm8903.h index e8490f3edd03..e3ec2433b215 100644 --- a/sound/soc/codecs/wm8903.h +++ b/sound/soc/codecs/wm8903.h | |||
| @@ -165,7 +165,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, | |||
| 165 | 165 | ||
| 166 | #define WM8903_VMID_RES_50K 2 | 166 | #define WM8903_VMID_RES_50K 2 |
| 167 | #define WM8903_VMID_RES_250K 3 | 167 | #define WM8903_VMID_RES_250K 3 |
| 168 | #define WM8903_VMID_RES_5K 4 | 168 | #define WM8903_VMID_RES_5K 6 |
| 169 | 169 | ||
| 170 | /* | 170 | /* |
| 171 | * R8 (0x08) - Analogue DAC 0 | 171 | * R8 (0x08) - Analogue DAC 0 |