diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-28 13:42:16 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-28 13:42:16 -0400 |
| commit | 062748b9053f637e985f47922c2e51cc3b2cc64c (patch) | |
| tree | 34a4e7067495b73cdead049c0ba0b644e4581bf9 /Documentation | |
| parent | 5a3ce539aad98cf5c2ed8a7513597d099fd66b12 (diff) | |
| parent | 3b89848d107602239a74825d1506a7a1c5556e6a (diff) | |
Merge tag 'v3.12.28' into v3.12-rt
This is the 3.12.28 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 95731a08f257..8f08b2a71791 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -2026,8 +2026,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ------------------- Module for sound cards based on the Asus AV66/AV100/AV200 chips, - i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX, - HDAV1.3 (Deluxe), and HDAV1.3 Slim. + i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe), + Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim. This module supports autoprobe and multiple cards. |