diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /include/sound/cs4231-regs.h | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/sound/cs4231-regs.h')
| -rw-r--r-- | include/sound/cs4231-regs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h index e8d1f3e31f9e..92647532c454 100644 --- a/include/sound/cs4231-regs.h +++ b/include/sound/cs4231-regs.h | |||
| @@ -177,4 +177,12 @@ | |||
| 177 | #define CS4236_RIGHT_WAVE 0x1c /* right wavetable serial port volume */ | 177 | #define CS4236_RIGHT_WAVE 0x1c /* right wavetable serial port volume */ |
| 178 | #define CS4236_VERSION 0x9c /* chip version and ID */ | 178 | #define CS4236_VERSION 0x9c /* chip version and ID */ |
| 179 | 179 | ||
| 180 | /* definitions for extended registers - OPTI93X */ | ||
| 181 | #define OPTi931_AUX_LEFT_INPUT 0x10 | ||
| 182 | #define OPTi931_AUX_RIGHT_INPUT 0x11 | ||
| 183 | #define OPTi93X_MIC_LEFT_INPUT 0x14 | ||
| 184 | #define OPTi93X_MIC_RIGHT_INPUT 0x15 | ||
| 185 | #define OPTi93X_OUT_LEFT 0x16 | ||
| 186 | #define OPTi93X_OUT_RIGHT 0x17 | ||
| 187 | |||
| 180 | #endif /* __SOUND_CS4231_REGS_H */ | 188 | #endif /* __SOUND_CS4231_REGS_H */ |