diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /sound/pci/au88x0/au8830.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'sound/pci/au88x0/au8830.h')
| -rw-r--r-- | sound/pci/au88x0/au8830.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/au88x0/au8830.h b/sound/pci/au88x0/au8830.h index aa77826b5e59..04ece1b1c218 100644 --- a/sound/pci/au88x0/au8830.h +++ b/sound/pci/au88x0/au8830.h | |||
| @@ -194,11 +194,6 @@ | |||
| 194 | 194 | ||
| 195 | #define VORTEX_CODEC_CTRL 0x29184 | 195 | #define VORTEX_CODEC_CTRL 0x29184 |
| 196 | #define VORTEX_CODEC_IO 0x29188 | 196 | #define VORTEX_CODEC_IO 0x29188 |
| 197 | #define VORTEX_CODEC_WRITE 0x00800000 | ||
| 198 | #define VORTEX_CODEC_ADDSHIFT 16 | ||
| 199 | #define VORTEX_CODEC_ADDMASK 0x7f0000 /* 0x000f0000 */ | ||
| 200 | #define VORTEX_CODEC_DATSHIFT 0 | ||
| 201 | #define VORTEX_CODEC_DATMASK 0xffff | ||
| 202 | 197 | ||
| 203 | #define VORTEX_CODEC_SPORTCTRL 0x2918c | 198 | #define VORTEX_CODEC_SPORTCTRL 0x2918c |
| 204 | 199 | ||