diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:39 +0200 |
| commit | 9dea75c70965c240012251dc5845fe0c1a061180 (patch) | |
| tree | d4779c1392bb8aa800f0e3cb12af9161e8f217db /Documentation | |
| parent | 8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (diff) | |
| parent | 04f9890df1bad2115665b7027e664aaffa44088d (diff) | |
| download | linux-stable-9dea75c70965c240012251dc5845fe0c1a061180.tar.gz linux-stable-9dea75c70965c240012251dc5845fe0c1a061180.tar.bz2 linux-stable-9dea75c70965c240012251dc5845fe0c1a061180.zip | |
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.txt | 3 |
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. ------------------- Module for sound cards based on the Asus AV100/AV200 chips, - i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX. + i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), Essence ST + (Deluxe) and Essence STX. This module supports autoprobe and multiple cards. |