Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 1e2e193..d37346b 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -15,6 +15,18 @@ config SND_AD1889
          To compile this as a module, choose M here: the module
          will be called snd-ad1889.
 
+config SND_ALS300
+        tristate "Avance Logic ALS300/ALS300+"
+        depends on SND
+        select SND_PCM
+        select SND_AC97_CODEC
+        select SND_OPL3_LIB
+        help
+          Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-als300
+
 config SND_ALS4000
        tristate "Avance Logic ALS4000"
        depends on SND && ISA_DMA_API
@@ -195,22 +207,28 @@ config SND_CS46XX
          will be called snd-cs46xx.
 
 config SND_CS46XX_NEW_DSP
-       bool "Cirrus Logic (Sound Fusion) New DSP support (EXPERIMENTAL)"
-       depends on SND_CS46XX && EXPERIMENTAL
+       bool "Cirrus Logic (Sound Fusion) New DSP support"
+       depends on SND_CS46XX
+        default y
        help
          Say Y here to use a new DSP image for SPDIF and dual codecs.
 
          This works better than the old code, so say Y.
 
 config SND_CS5535AUDIO
-       tristate "CS5535 Audio"
+       tristate "CS5535/CS5536 Audio"
        depends on SND && X86 && !X86_64
        select SND_PCM
        select SND_AC97_CODEC
        help
          Say Y here to include support for audio on CS5535 chips. It is
          referred to as NS CS5535 IO or AMD CS5535 IO companion in
-         various literature.
+         various literature. This driver also supports the CS5536 audio
+         device. However, for both chips, on certain boards, you may
+         need to use ac97_quirk=hp_only if your board has physically 
+         mapped headphone out to master output. If that works for you,
+         send lspci -vvv output to the mailing list so that your board
+         can be identified in the quirks list.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-cs5535audio.
@@ -466,6 +484,19 @@ config SND_PCXHR
          To compile this driver as a module, choose M here: the module
          will be called snd-pcxhr.
 
+config SND_RIPTIDE
+       tristate "Conexant Riptide"
+       depends on SND
+       depends on FW_LOADER
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_AC97_CODEC
+       help
+         Say 'Y' or 'M' to include support for Conexant Riptide chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-riptide
+
 config SND_RME32
        tristate "RME Digi32, 32/8, 32 PRO"
        depends on SND