diff options
| author |  Mark Brown <broonie@opensource.wolfsonmicro.com>
| 2011-02-22 10:38:13 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com>
| 2011-02-22 10:38:13 -0800 |
| commit | 4c090edfbbe3f8e63ec9fb7abaab17e0191646a1 (patch) | |
| tree | f90c28b485d7b43c4162e834c6f1b5b7bd6ae294 /sound/soc/codecs/wm8903.h | |
| parent | ASoC: Hook wm_hubs micbiases up to CLK_SYS (diff) | |
| parent | ASoC: Hook wm_hubs micbiases up to CLK_SYS (diff) | |
| download | linux-4c090edfbbe3f8e63ec9fb7abaab17e0191646a1.tar.gz linux-4c090edfbbe3f8e63ec9fb7abaab17e0191646a1.tar.bz2 linux-4c090edfbbe3f8e63ec9fb7abaab17e0191646a1.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
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 9ef394ae0dd3..db949311c0f2 100644 --- a/sound/soc/codecs/wm8903.h +++ b/sound/soc/codecs/wm8903.h @@ -173,7 +173,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, #define WM8903_VMID_RES_50K 2 #define WM8903_VMID_RES_250K 3 -#define WM8903_VMID_RES_5K 4 +#define WM8903_VMID_RES_5K 6 /* * R8 (0x08) - Analogue DAC 0 |