aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:39 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:39 -0400
commit9dea75c70965c240012251dc5845fe0c1a061180 (patch)
treed4779c1392bb8aa800f0e3cb12af9161e8f217db /Documentation
parent8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (diff)
parent04f9890df1bad2115665b7027e664aaffa44088d (diff)
Merge branch 'topic/oxygen' into for-linus
* topic/oxygen: sound: virtuoso: add Xonar Essence ST support sound: virtuoso: enable HDAV S/PDIF input sound: virtuoso: add another DX PCI ID sound: oxygen: reset DMA when stream is closed
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 945de361022f..096af12a0afa 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1886,7 +1886,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1886 ------------------- 1886 -------------------
1887 1887
1888 Module for sound cards based on the Asus AV100/AV200 chips, 1888 Module for sound cards based on the Asus AV100/AV200 chips,
1889 i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX. 1889 i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), Essence ST
1890 (Deluxe) and Essence STX.
1890 1891
1891 This module supports autoprobe and multiple cards. 1892 This module supports autoprobe and multiple cards.
1892 1893