diff options
author | David S. Miller | 2008-12-03 04:50:27 +0100 |
---|---|---|
committer | David S. Miller | 2008-12-03 04:50:27 +0100 |
commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /Documentation/sound/alsa/ALSA-Configuration.txt | |
parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rus... (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
download | kernel-qcow2-linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz kernel-qcow2-linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.xz kernel-qcow2-linux-aa2ba5f1082dc705745899584aac8416d710c056.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'Documentation/sound/alsa/ALSA-Configuration.txt')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e0e54a27fc10..3cd2ad958176 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1072,10 +1072,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ref Reference board dell-m4-1 Dell desktops dell-m4-2 Dell desktops + dell-m4-3 Dell desktops STAC92HD73* ref Reference board - dell-m6 Dell desktops + dell-m6-amic Dell desktops/laptops with analog mics + dell-m6-dmic Dell desktops/laptops with digital mics + dell-m6 Dell desktops/laptops with both type of mics STAC9872 vaio Setup for VAIO FE550G/SZ110 |