diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/sound/cs4231-regs.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/sound/cs4231-regs.h')
| -rw-r--r-- | include/sound/cs4231-regs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h index 92647532c454..66d28c2cb53d 100644 --- a/include/sound/cs4231-regs.h +++ b/include/sound/cs4231-regs.h | |||
| @@ -70,7 +70,6 @@ | |||
| 70 | #define AD1845_PWR_DOWN 0x1b /* power down control */ | 70 | #define AD1845_PWR_DOWN 0x1b /* power down control */ |
| 71 | #define CS4235_LEFT_MASTER 0x1b /* left master output control */ | 71 | #define CS4235_LEFT_MASTER 0x1b /* left master output control */ |
| 72 | #define CS4231_REC_FORMAT 0x1c /* clock and data format - record - bits 7-0 MCE */ | 72 | #define CS4231_REC_FORMAT 0x1c /* clock and data format - record - bits 7-0 MCE */ |
| 73 | #define CS4231_PLY_VAR_FREQ 0x1d /* playback variable frequency */ | ||
| 74 | #define AD1845_CLOCK 0x1d /* crystal clock select and total power down */ | 73 | #define AD1845_CLOCK 0x1d /* crystal clock select and total power down */ |
| 75 | #define CS4235_RIGHT_MASTER 0x1d /* right master output control */ | 74 | #define CS4235_RIGHT_MASTER 0x1d /* right master output control */ |
| 76 | #define CS4231_REC_UPR_CNT 0x1e /* record upper count */ | 75 | #define CS4231_REC_UPR_CNT 0x1e /* record upper count */ |