diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-09 06:29:13 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-09 06:29:13 -0500 |
| commit | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (patch) | |
| tree | f5f3751abc5c85effcb5d88101858c51dd19b234 /sound/soc/codecs/wm8580.c | |
| parent | 05d209ad3b66efbb0925f01f1b3369fcbf31c86f (diff) | |
| parent | a0968628097380be52db8b4664da98fc425546a5 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
| -rw-r--r-- | sound/soc/codecs/wm8580.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 45efc9437ee8..0ebdecfd27a9 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
| @@ -160,7 +160,7 @@ | |||
| 160 | static const u16 wm8580_reg[] = { | 160 | static const u16 wm8580_reg[] = { |
| 161 | 0x0121, 0x017e, 0x007d, 0x0014, /*R3*/ | 161 | 0x0121, 0x017e, 0x007d, 0x0014, /*R3*/ |
| 162 | 0x0121, 0x017e, 0x007d, 0x0194, /*R7*/ | 162 | 0x0121, 0x017e, 0x007d, 0x0194, /*R7*/ |
| 163 | 0x001c, 0x0002, 0x0002, 0x00c2, /*R11*/ | 163 | 0x0010, 0x0002, 0x0002, 0x00c2, /*R11*/ |
| 164 | 0x0182, 0x0082, 0x000a, 0x0024, /*R15*/ | 164 | 0x0182, 0x0082, 0x000a, 0x0024, /*R15*/ |
| 165 | 0x0009, 0x0000, 0x00ff, 0x0000, /*R19*/ | 165 | 0x0009, 0x0000, 0x00ff, 0x0000, /*R19*/ |
| 166 | 0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R23*/ | 166 | 0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R23*/ |