diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 08:37:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 08:37:14 +0100 |
| commit | e38302f78284e3e80ffc2eef54001fce7d183bd4 (patch) | |
| tree | 0cb61d52ca9d11d446e3fc1bc97d8fd92ab1e934 /Documentation | |
| parent | Linux 2.6.37 (diff) | |
| parent | ALSA: oxygen: fix Xonar DG input (diff) | |
| download | linux-e38302f78284e3e80ffc2eef54001fce7d183bd4.tar.xz linux-e38302f78284e3e80ffc2eef54001fce7d183bd4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index d0eb696d32e8..3c1eddd9fcc7 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -974,13 +974,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. See hdspm.txt for details. - Module snd-hifier - ----------------- - - Module for the MediaTek/TempoTec HiFier Fantasia sound card. - - This module supports autoprobe and multiple cards. - Module snd-ice1712 ------------------ @@ -1531,15 +1524,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-oxygen ----------------- - Module for sound cards based on the C-Media CMI8788 chip: + Module for sound cards based on the C-Media CMI8786/8787/8788 chip: * Asound A-8788 + * Asus Xonar DG * AuzenTech X-Meridian + * AuzenTech X-Meridian 2G * Bgears b-Enspirer * Club3D Theatron DTS * HT-Omega Claro (plus) * HT-Omega Claro halo (XT) + * Kuroutoshikou CMI8787-HG2PCI * Razer Barracuda AC-1 * Sondigo Inferno + * TempoTec HiFier Fantasia + * TempoTec HiFier Serenade This module supports autoprobe and multiple cards. @@ -2006,9 +2004,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-virtuoso ------------------- - Module for sound cards based on the Asus AV100/AV200 chips, - i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST - (Deluxe) and Essence STX. + 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. This module supports autoprobe and multiple cards. |