aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt26
1 files changed, 19 insertions, 7 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index b117e42a6166..dd083b2a5bd3 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -746,8 +746,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
746 Module snd-hda-intel 746 Module snd-hda-intel
747 -------------------- 747 --------------------
748 748
749 Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8), 749 Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,
750 ATI SB450, SB600, RS600, 750 PCH, SCH),
751 ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,
752 RV630, RV635, RV670, RV770,
751 VIA VT8251/VT8237A, 753 VIA VT8251/VT8237A,
752 SIS966, ULI M5461 754 SIS966, ULI M5461
753 755
@@ -1166,6 +1168,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1166 * Event Electronics, EZ8 1168 * Event Electronics, EZ8
1167 * Digigram VX442 1169 * Digigram VX442
1168 * Lionstracs, Mediastaton 1170 * Lionstracs, Mediastaton
1171 * Terrasoniq TS 88
1169 1172
1170 model - Use the given board model, one of the following: 1173 model - Use the given board model, one of the following:
1171 delta1010, dio2496, delta66, delta44, audiophile, delta410, 1174 delta1010, dio2496, delta66, delta44, audiophile, delta410,
@@ -1200,7 +1203,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1200 * TerraTec Phase 22 1203 * TerraTec Phase 22
1201 * TerraTec Phase 28 1204 * TerraTec Phase 28
1202 * AudioTrak Prodigy 7.1 1205 * AudioTrak Prodigy 7.1
1203 * AudioTrak Prodigy 7.1LT 1206 * AudioTrak Prodigy 7.1 LT
1207 * AudioTrak Prodigy 7.1 XT
1208 * AudioTrak Prodigy 7.1 HIFI
1209 * AudioTrak Prodigy 7.1 HD2
1204 * AudioTrak Prodigy 192 1210 * AudioTrak Prodigy 192
1205 * Pontis MS300 1211 * Pontis MS300
1206 * Albatron K8X800 Pro II 1212 * Albatron K8X800 Pro II
@@ -1211,12 +1217,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1211 * Shuttle SN25P 1217 * Shuttle SN25P
1212 * Onkyo SE-90PCI 1218 * Onkyo SE-90PCI
1213 * Onkyo SE-200PCI 1219 * Onkyo SE-200PCI
1220 * ESI Juli@
1221 * Hercules Fortissimo IV
1222 * EGO-SYS WaveTerminal 192M
1214 1223
1215 model - Use the given board model, one of the following: 1224 model - Use the given board model, one of the following:
1216 revo51, revo71, amp2000, prodigy71, prodigy71lt, 1225 revo51, revo71, amp2000, prodigy71, prodigy71lt,
1217 prodigy192, aureon51, aureon71, universe, ap192, 1226 prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,
1218 k8x800, phase22, phase28, ms300, av710, se200pci, 1227 juli, aureon51, aureon71, universe, ap192, k8x800,
1219 se90pci 1228 phase22, phase28, ms300, av710, se200pci, se90pci,
1229 fortissimo4, sn25p, WT192M
1220 1230
1221 This module supports multiple cards and autoprobe. 1231 This module supports multiple cards and autoprobe.
1222 1232
@@ -1255,7 +1265,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1255 1265
1256 Module for AC'97 motherboards from Intel and compatibles. 1266 Module for AC'97 motherboards from Intel and compatibles.
1257 * Intel i810/810E, i815, i820, i830, i84x, MX440 1267 * Intel i810/810E, i815, i820, i830, i84x, MX440
1258 ICH5, ICH6, ICH7, ESB2 1268 ICH5, ICH6, ICH7, 6300ESB, ESB2
1259 * SiS 7012 (SiS 735) 1269 * SiS 7012 (SiS 735)
1260 * NVidia NForce, NForce2, NForce3, MCP04, CK804 1270 * NVidia NForce, NForce2, NForce3, MCP04, CK804
1261 CK8, CK8S, MCP501 1271 CK8, CK8S, MCP501
@@ -1951,6 +1961,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1951 * CHIC True Sound 4Dwave 1961 * CHIC True Sound 4Dwave
1952 * Shark Predator4D-PCI 1962 * Shark Predator4D-PCI
1953 * Jaton SonicWave 4D 1963 * Jaton SonicWave 4D
1964 * SiS SI7018 PCI Audio
1965 * Hoontech SoundTrack Digital 4DWave NX
1954 1966
1955 pcm_channels - max channels (voices) reserved for PCM 1967 pcm_channels - max channels (voices) reserved for PCM
1956 wavetable_size - max wavetable size in kB (4-?kb) 1968 wavetable_size - max wavetable size in kB (4-?kb)