Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

[linux-2.6] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index d3be87d11259f9b5802e8de9024fff5fa5aad342..812085d521f12405867dd4c70096b49b8ef79212 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -203,7 +203,6 @@ config SND_OXYGEN
           * HT-Omega Claro
           * Razer Barracuda AC-1
           * Sondigo Inferno
-          * TempoTec HIFIER
 
          To compile this driver as a module, choose M here: the module
          will be called snd-oxygen.
@@ -648,6 +647,17 @@ config SND_HDSPM
          To compile this driver as a module, choose M here: the module
          will be called snd-hdspm.
 
+config SND_HIFIER
+       tristate "TempoTec HiFier Fantasia"
+       depends on SND
+       select SND_OXYGEN_LIB
+       help
+         Say Y here to include support for the MediaTek/TempoTec HiFier
+         Fantasia sound card.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-hifier.
+
 config SND_ICE1712
        tristate "ICEnsemble ICE1712 (Envy24)"
        depends on SND
@@ -885,6 +895,17 @@ config SND_VIA82XX_MODEM
          To compile this driver as a module, choose M here: the module
          will be called snd-via82xx-modem.
 
+config SND_VIRTUOSO
+       tristate "Asus Virtuoso 200 (Xonar)"
+       depends on SND
+       select SND_OXYGEN_LIB
+       help
+         Say Y here to include support for sound cards based on the
+         Asus AV200 chip, i.e., Xonar D2 and Xonar D2X.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-virtuoso.
+
 config SND_VX222
        tristate "Digigram VX222"
        depends on SND