diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 20:32:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 20:32:45 -0500 |
| commit | cba5a641ca7887dc371486681dac887869d1c7b7 (patch) | |
| tree | 0f083cfdec8c72657ccf90c2bab3f288027b68bf /Documentation | |
| parent | 9f6632d6290785caf9e9f874c0a0cfaf2c178e59 (diff) | |
| parent | 6185af1f4254a53563fe6d6af652f5775fc70e25 (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.14rc3
[ALSA] cmipci - Allow to disable integrated FM port
[ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
[ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
[ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
[ALSA] Add missing sysfs device assignment for ALSA PCI drivers
[ALSA] hda-codec - Define pin configs for MacBooks
[ALSA] hda-codec - Add missing Mic Boost controls for ALC262
[ALSA] soc - WM9712 PCM volume
[ALSA] soc - Fix WM9712 register cache entry
[ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
[ALSA] hda-codec - Add LFE support on Dell M90
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index c30ff1bb2d10..db398a6441c1 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) |
| @@ -895,10 +897,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 895 | can be adjusted. Appearing only when compiled with | 897 | can be adjusted. Appearing only when compiled with |
| 896 | $CONFIG_SND_DEBUG=y | 898 | $CONFIG_SND_DEBUG=y |
| 897 | 899 | ||
| 898 | STAC9200/9205/9220/9221/9254 | 900 | STAC9200/9205/9254 |
| 901 | ref Reference board | ||
| 902 | |||
| 903 | STAC9220/9221 | ||
| 899 | ref Reference board | 904 | ref Reference board |
| 900 | 3stack D945 3stack | 905 | 3stack D945 3stack |
| 901 | 5stack D945 5stack + SPDIF | 906 | 5stack D945 5stack + SPDIF |
| 907 | macmini Intel Mac Mini | ||
| 908 | macbook Intel Mac Book | ||
| 909 | macbook-pro Intel Mac Book Pro | ||
| 902 | 910 | ||
| 903 | STAC9202/9250/9251 | 911 | STAC9202/9250/9251 |
| 904 | ref Reference board, base config | 912 | ref Reference board, base config |