summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-11-02 17:08:37 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-03 08:19:11 +0100
commit45c1de8e20cec40b6846def0aeca09cb1bfb839b (patch)
tree6a994668f7258422de9cbfd1fb80ebaf0bd21c61 /Documentation
parente6d06e085bb5e7769c91bd14eb46094034fff8e6 (diff)
downloadlinux-stable-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.gz
linux-stable-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.bz2
linux-stable-45c1de8e20cec40b6846def0aeca09cb1bfb839b.zip
ALSA: oxygen: merge HiFier driver into snd-oxygen
The snd-hifier driver contains more duplicated code than model-specific code, so it does not make sense for it to be a separate driver. Handling the two-channel output restriction can be easily done in the generic driver. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt10
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index d0eb696d32e8..f1a1787e71e5 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,7 +1524,7 @@ 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 CMI8787/8788 chip:
* Asound A-8788
* AuzenTech X-Meridian
* Bgears b-Enspirer
@@ -1540,6 +1533,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
* HT-Omega Claro halo (XT)
* Razer Barracuda AC-1
* Sondigo Inferno
+ * TempoTec HiFier Fantasia
This module supports autoprobe and multiple cards.