Merge ../linus

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

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 95754e2f71b8c680173bb5f33773f5eb1a7b2028..f4980ca5c05c86d9f4cbd8c86c885f2bd35af09c 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -493,6 +493,19 @@ config SOUND_CS4232
          See <file:Documentation/sound/oss/CS4232> for more information on
          configuring this card.
 
+config SOUND_SSCAPE
+       tristate "Ensoniq SoundScape support"
+       depends on SOUND_OSS
+       help
+         Answer Y if you have a sound card based on the Ensoniq SoundScape
+         chipset. Such cards are being manufactured at least by Ensoniq, Spea
+         and Reveal (Reveal makes also other cards).
+
+         If you compile the driver into the kernel, you have to add
+         "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command
+         line.
+
+
 config SOUND_VMIDI
        tristate "Loopback MIDI device support"
        depends on SOUND_OSS
@@ -839,6 +852,6 @@ config SOUND_SH_DAC_AUDIO
        depends on SOUND_PRIME && CPU_SH3
 
 config SOUND_SH_DAC_AUDIO_CHANNEL
-       int "    DAC channel"
+       int "DAC channel"
        default "1"
        depends on SOUND_SH_DAC_AUDIO