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/au8820.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'sound/pci/au88x0/au8820.h')
| -rw-r--r-- | sound/pci/au88x0/au8820.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/au88x0/au8820.h b/sound/pci/au88x0/au8820.h index be8022e78714..abbe85e4f7a9 100644 --- a/sound/pci/au88x0/au8820.h +++ b/sound/pci/au88x0/au8820.h | |||
| @@ -162,11 +162,6 @@ | |||
| 162 | #define EN_SPORT 0x00030000 | 162 | #define EN_SPORT 0x00030000 |
| 163 | #define EN_SPDIF 0x000c0000 | 163 | #define EN_SPDIF 0x000c0000 |
| 164 | #define VORTEX_CODEC_CHN 0x11880 | 164 | #define VORTEX_CODEC_CHN 0x11880 |
| 165 | #define VORTEX_CODEC_WRITE 0x00800000 | ||
| 166 | #define VORTEX_CODEC_ADDSHIFT 16 | ||
| 167 | #define VORTEX_CODEC_ADDMASK 0x7f0000 /* 0x000f0000 */ | ||
| 168 | #define VORTEX_CODEC_DATSHIFT 0 | ||
| 169 | #define VORTEX_CODEC_DATMASK 0xffff | ||
| 170 | #define VORTEX_CODEC_IO 0x11988 | 165 | #define VORTEX_CODEC_IO 0x11988 |
| 171 | 166 | ||
| 172 | #define VORTEX_SPDIF_FLAGS 0x1005c /* FIXME */ | 167 | #define VORTEX_SPDIF_FLAGS 0x1005c /* FIXME */ |