summaryrefslogtreecommitdiffstats
path: root/sound/isa/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:36:15 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:36:15 +0100
commit4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (patch)
tree8a362dd8938e06e13a7fff24e0507558e1ab25b4 /sound/isa/Kconfig
parentfa15fdeffa3977b17882f485547e65296cf0bd30 (diff)
parent5e7476243ad755fa1d8be2b1774d0aeb16bb48df (diff)
downloadlinux-4c5ecb7e59662a76754efdd41c6ed4415e6e9840.tar.gz
linux-4c5ecb7e59662a76754efdd41c6ed4415e6e9840.tar.bz2
linux-4c5ecb7e59662a76754efdd41c6ed4415e6e9840.zip
Merge branch 'topic/msnd' into for-linus
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r--sound/isa/Kconfig31
1 files changed, 31 insertions, 0 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 4e06bbd9298d..2df20e403f24 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -402,5 +402,36 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
you need to install the firmware files from the
alsa-firmware package.
+config SND_MSND_PINNACLE
+ tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say Y to include support for Turtle Beach MultiSound Pinnacle/
+ Fiji soundcards.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-pinnacle.
+
+config SND_MSND_CLASSIC
+ tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
+ Monterey (not for the Pinnacle or Fiji).
+
+ See <file:Documentation/sound/oss/MultiSound> for important information
+ about this driver. Note that it has been discontinued, but the
+ Voyetra Turtle Beach knowledge base entry for it is still available
+ at <http://www.turtlebeach.com/site/kb_ftp/790.asp>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-classic.
+
endif # SND_ISA