diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:17 +0100 |
| commit | b54fc8dd2c43888f2754505cca2b6e88604a8ffa (patch) | |
| tree | 7613f3734b0b91c316438c2fd3814a5565e8593a /Documentation/sound | |
| parent | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (diff) | |
| parent | 873591db59e66434fd0a484c92f69fc21100b33d (diff) | |
| download | linux-stable-b54fc8dd2c43888f2754505cca2b6e88604a8ffa.tar.gz linux-stable-b54fc8dd2c43888f2754505cca2b6e88604a8ffa.tar.bz2 linux-stable-b54fc8dd2c43888f2754505cca2b6e88604a8ffa.zip | |
Merge branch 'topic/oxygen' into for-linus
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 c911c203d1f5..012858d2b119 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1859,7 +1859,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 and HDAV1.3 (Deluxe). + i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX. This module supports autoprobe and multiple cards. |