diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 05:59:39 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 05:59:39 -0500 |
commit | fd10902797fc9d6abaf55d9c2e3c6698c90b10c7 (patch) | |
tree | 0bc15b8b967e6f0973387e7c81f5b0dc9ce44e75 /Documentation/sound/alsa | |
parent | 5b3eec0c80038c8739ccd465b897a35c0dff1cc4 (diff) | |
parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) |
Merge commit 'v2.6.28-rc8' into x86/irq
Diffstat (limited to 'Documentation/sound/alsa')
-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. | |||
1072 | ref Reference board | 1072 | ref Reference board |
1073 | dell-m4-1 Dell desktops | 1073 | dell-m4-1 Dell desktops |
1074 | dell-m4-2 Dell desktops | 1074 | dell-m4-2 Dell desktops |
1075 | dell-m4-3 Dell desktops | ||
1075 | 1076 | ||
1076 | STAC92HD73* | 1077 | STAC92HD73* |
1077 | ref Reference board | 1078 | ref Reference board |
1078 | dell-m6 Dell desktops | 1079 | dell-m6-amic Dell desktops/laptops with analog mics |
1080 | dell-m6-dmic Dell desktops/laptops with digital mics | ||
1081 | dell-m6 Dell desktops/laptops with both type of mics | ||
1079 | 1082 | ||
1080 | STAC9872 | 1083 | STAC9872 |
1081 | vaio Setup for VAIO FE550G/SZ110 | 1084 | vaio Setup for VAIO FE550G/SZ110 |