Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 50dd0086cfb1a3361beffa533990b7aed7f59304..edfc1b8d553ee3c6e1ad4bfd4d424fce7631b292 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -793,6 +793,15 @@ config SND_RME9652
          To compile this driver as a module, choose M here: the module
          will be called snd-rme9652.
 
+config SND_SE6X
+       tristate "Studio Evolution SE6X"
+       depends on SND_OXYGEN=n && SND_VIRTUOSO=n  # PCI ID conflict
+       select SND_OXYGEN_LIB
+       select SND_PCM
+       select SND_MPU401_UART
+       help
+         Say Y or M here only if you actually have this sound card.
+
 config SND_SIS7019
        tristate "SiS 7019 Audio Accelerator"
        depends on X86_32