Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 4e06bbd9298d34be193cf4383b1331e35dd2282e..c5c9a9218ff6ef3c209c7554c2c788eb3b516de2 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -368,14 +368,17 @@ config SND_SGALAXY
          will be called snd-sgalaxy.
 
 config SND_SSCAPE
-       tristate "Ensoniq SoundScape PnP driver"
+       tristate "Ensoniq SoundScape driver"
        select SND_HWDEP
        select SND_MPU401_UART
        select SND_WSS_LIB
        help
-         Say Y here to include support for Ensoniq SoundScape PnP
+         Say Y here to include support for Ensoniq SoundScape 
          soundcards.
 
+         The PCM audio is supported on SoundScape Classic, Elite, PnP
+         and VIVO cards. The MIDI support is very experimental.
+
          To compile this driver as a module, choose M here: the module
          will be called snd-sscape.
 
@@ -402,5 +405,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