diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /include/sound/emu10k1.h | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/sound/emu10k1.h')
| -rw-r--r-- | include/sound/emu10k1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 14cb2718cb77..46e3c0bf3c94 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h | |||
| @@ -1055,6 +1055,7 @@ typedef struct { | |||
| 1055 | unsigned char emu10k2_chip; /* Audigy 1 or Audigy 2. */ | 1055 | unsigned char emu10k2_chip; /* Audigy 1 or Audigy 2. */ |
| 1056 | unsigned char ca0102_chip; /* Audigy 1 or Audigy 2. Not SB Audigy 2 Value. */ | 1056 | unsigned char ca0102_chip; /* Audigy 1 or Audigy 2. Not SB Audigy 2 Value. */ |
| 1057 | unsigned char ca0108_chip; /* Audigy 2 Value */ | 1057 | unsigned char ca0108_chip; /* Audigy 2 Value */ |
| 1058 | unsigned char ca_cardbus_chip; /* Audigy 2 ZS Notebook */ | ||
| 1058 | unsigned char ca0151_chip; /* P16V */ | 1059 | unsigned char ca0151_chip; /* P16V */ |
| 1059 | unsigned char spk71; /* Has 7.1 speakers */ | 1060 | unsigned char spk71; /* Has 7.1 speakers */ |
| 1060 | unsigned char sblive51; /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */ | 1061 | unsigned char sblive51; /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */ |