diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
| commit | cba5a641ca7887dc371486681dac887869d1c7b7 (patch) | |
| tree | 0f083cfdec8c72657ccf90c2bab3f288027b68bf /Documentation | |
| parent | 9f6632d6290785caf9e9f874c0a0cfaf2c178e59 (diff) | |
| parent | 6185af1f4254a53563fe6d6af652f5775fc70e25 (diff) | |
| download | linux-cba5a641ca7887dc371486681dac887869d1c7b7.tar.gz linux-cba5a641ca7887dc371486681dac887869d1c7b7.tar.bz2 linux-cba5a641ca7887dc371486681dac887869d1c7b7.zip | |
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. mpu_port - 0x300,0x310,0x320,0x330 = legacy port, 1 = integrated PCI port, 0 = disable (default) - fm_port - 0x388 (default), 0 = disable (default) + fm_port - 0x388 = legacy port, + 1 = integrated PCI port (default), + 0 = disable soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) (default = 1) 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. can be adjusted. Appearing only when compiled with $CONFIG_SND_DEBUG=y - STAC9200/9205/9220/9221/9254 + STAC9200/9205/9254 + ref Reference board + + STAC9220/9221 ref Reference board 3stack D945 3stack 5stack D945 5stack + SPDIF + macmini Intel Mac Mini + macbook Intel Mac Book + macbook-pro Intel Mac Book Pro STAC9202/9250/9251 ref Reference board, base config |