diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 13:50:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 13:50:44 -0400 |
commit | 98ae6878f151b0b508b09a36367c231b707a88cf (patch) | |
tree | d6fdd23d6f78d0713ac6290c75bf39c2a65c12c7 /Documentation | |
parent | b720a3be1abd0cb5b9b530c0a1b4044fec4de60e (diff) | |
parent | 5f1545bc45a33361d6bb2fb44af7c35bcd733b9d (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] hda-intel - Fix HDA buffer alignment
[ALSA] hda-codec - Add model for HP Compaq d5750
[ALSA] hda-codec - Add support for MacBook Pro 1st generation
[ALSA] version 1.0.14rc3
[ALSA] hda-codec - Add model for HP Compaq d5700
[ALSA] intel8x0 - Fix Oops at kdump crash kernel
[ALSA] hda-codec - Fix speaker output on MacPro
[ALSA] hda-codec - more systems for Analog Devices
[ALSA] hda-intel - Fix codec probe with ATI contorllers
[ALSA] hda-codec - Add suppoprt for Asus M2N-SLI motherboard
[ALSA] intel8x0 - Fix speaker output after S2RAM
[ALSA] ac97 - fix AD shared shared jack control logic
[ALSA] soc - Fix dependencies in Kconfig files
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index db398a6441c..73e9a174b64 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -866,6 +866,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
866 | basic 3-jack (default) | 866 | basic 3-jack (default) |
867 | hp HP nx6320 | 867 | hp HP nx6320 |
868 | thinkpad Lenovo Thinkpad T60/X60/Z60 | 868 | thinkpad Lenovo Thinkpad T60/X60/Z60 |
869 | toshiba Toshiba U205 | ||
869 | 870 | ||
870 | AD1986A | 871 | AD1986A |
871 | 6stack 6-jack, separate surrounds (default) | 872 | 6stack 6-jack, separate surrounds (default) |
@@ -906,7 +907,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
906 | 5stack D945 5stack + SPDIF | 907 | 5stack D945 5stack + SPDIF |
907 | macmini Intel Mac Mini | 908 | macmini Intel Mac Mini |
908 | macbook Intel Mac Book | 909 | macbook Intel Mac Book |
909 | macbook-pro Intel Mac Book Pro | 910 | macbook-pro-v1 Intel Mac Book Pro 1st generation |
911 | macbook-pro Intel Mac Book Pro 2nd generation | ||
910 | 912 | ||
911 | STAC9202/9250/9251 | 913 | STAC9202/9250/9251 |
912 | ref Reference board, base config | 914 | ref Reference board, base config |