diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-25 09:20:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-25 09:20:57 -0500 |
| commit | eefe93b9957e6f14780b7d37aeda0f27f341953d (patch) | |
| tree | 4b73293616abc911ead9d559a58b897885d7ad86 /Documentation/sound/alsa | |
| parent | ee09543c866559e1ffb4f5c38533f2bedd725acd (diff) | |
| parent | 661cd8fb5210af78f0763071642e0764a10389a6 (diff) | |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'Documentation/sound/alsa')
| -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 93624e7b4f04..773a6201aede 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1083,7 +1083,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1083 | 1083 | ||
| 1084 | STAC92HD73* | 1084 | STAC92HD73* |
| 1085 | ref Reference board | 1085 | ref Reference board |
| 1086 | dell-m6 Dell desktops | 1086 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1087 | dell-m6-dmic Dell desktops/laptops with digital mics | ||
| 1088 | dell-m6 Dell desktops/laptops with both type of mics | ||
| 1087 | 1089 | ||
| 1088 | STAC9872 | 1090 | STAC9872 |
| 1089 | vaio Setup for VAIO FE550G/SZ110 | 1091 | vaio Setup for VAIO FE550G/SZ110 |