diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-25 15:20:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-25 15:20:57 +0100 |
| commit | eefe93b9957e6f14780b7d37aeda0f27f341953d (patch) | |
| tree | 4b73293616abc911ead9d559a58b897885d7ad86 /Documentation/sound | |
| parent | ALSA: hda - Add quirk for MSI 7260 mobo (diff) | |
| parent | ALSA: hda - Check model for Dell 92HD73xx laptops (diff) | |
| download | linux-eefe93b9957e6f14780b7d37aeda0f27f341953d.tar.xz linux-eefe93b9957e6f14780b7d37aeda0f27f341953d.zip | |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'Documentation/sound')
| -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. 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 |