diff options
Diffstat (limited to 'Documentation/sound/alsa/ALSA-Configuration.txt')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index c30ff1bb2d10..73e9a174b642 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -370,7 +370,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
370 | mpu_port - 0x300,0x310,0x320,0x330 = legacy port, | 370 | mpu_port - 0x300,0x310,0x320,0x330 = legacy port, |
371 | 1 = integrated PCI port, | 371 | 1 = integrated PCI port, |
372 | 0 = disable (default) | 372 | 0 = disable (default) |
373 | fm_port - 0x388 (default), 0 = disable (default) | 373 | fm_port - 0x388 = legacy port, |
374 | 1 = integrated PCI port (default), | ||
375 | 0 = disable | ||
374 | soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) | 376 | soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) |
375 | (default = 1) | 377 | (default = 1) |
376 | joystick_port - Joystick port address (0 = disable, 1 = auto-detect) | 378 | joystick_port - Joystick port address (0 = disable, 1 = auto-detect) |
@@ -864,6 +866,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
864 | basic 3-jack (default) | 866 | basic 3-jack (default) |
865 | hp HP nx6320 | 867 | hp HP nx6320 |
866 | thinkpad Lenovo Thinkpad T60/X60/Z60 | 868 | thinkpad Lenovo Thinkpad T60/X60/Z60 |
869 | toshiba Toshiba U205 | ||
867 | 870 | ||
868 | AD1986A | 871 | AD1986A |
869 | 6stack 6-jack, separate surrounds (default) | 872 | 6stack 6-jack, separate surrounds (default) |
@@ -895,10 +898,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
895 | can be adjusted. Appearing only when compiled with | 898 | can be adjusted. Appearing only when compiled with |
896 | $CONFIG_SND_DEBUG=y | 899 | $CONFIG_SND_DEBUG=y |
897 | 900 | ||
898 | STAC9200/9205/9220/9221/9254 | 901 | STAC9200/9205/9254 |
902 | ref Reference board | ||
903 | |||
904 | STAC9220/9221 | ||
899 | ref Reference board | 905 | ref Reference board |
900 | 3stack D945 3stack | 906 | 3stack D945 3stack |
901 | 5stack D945 5stack + SPDIF | 907 | 5stack D945 5stack + SPDIF |
908 | macmini Intel Mac Mini | ||
909 | macbook Intel Mac Book | ||
910 | macbook-pro-v1 Intel Mac Book Pro 1st generation | ||
911 | macbook-pro Intel Mac Book Pro 2nd generation | ||
902 | 912 | ||
903 | STAC9202/9250/9251 | 913 | STAC9202/9250/9251 |
904 | ref Reference board, base config | 914 | ref Reference board, base config |