diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-18 18:23:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-18 18:23:23 +0100 |
| commit | 88501ce18eaaf1273e024d26926134972f4644ea (patch) | |
| tree | b7302cdc5ffa37288ecafbb9db0aaae63ca7ee51 /Documentation/sound | |
| parent | 408bffd01cfcda2907b07fb86b3666e3db86fd82 (diff) | |
| parent | d1db38c015a392b0ea8c15ab95abb3ee768b8d47 (diff) | |
| download | linux-3.10-88501ce18eaaf1273e024d26926134972f4644ea.tar.gz linux-3.10-88501ce18eaaf1273e024d26926134972f4644ea.tar.bz2 linux-3.10-88501ce18eaaf1273e024d26926134972f4644ea.zip | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index c83fd7b6420..33df82e3a39 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1948,7 +1948,7 @@ 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), Essence ST + i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST (Deluxe) and Essence STX. This module supports autoprobe and multiple cards. |