offb: use framebuffer_alloc() to allocate fb_info struct

[sfrench/cifs-2.6.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index c5c9a9218ff6ef3c209c7554c2c788eb3b516de2..51a7e3777e17750639faf186befa3a4b4d751520 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -177,15 +177,18 @@ config SND_ES18XX
          will be called snd-es18xx.
 
 config SND_SC6000
-       tristate "Gallant SC-6000, Audio Excel DSP 16"
+       tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16"
        depends on HAS_IOPORT
        select SND_WSS_LIB
        select SND_OPL3_LIB
        select SND_MPU401_UART
        help
-         Say Y here to include support for Gallant SC-6000 card and clones:
+         Say Y here to include support for Gallant SC-6000, SC-6600, SC-7000
+         cards and clones:
          Audio Excel DSP 16 and Zoltrix AV302.
 
+         These cards are based on CompuMedia ASC-9308 or ASC-9408 chips.
+
          To compile this driver as a module, choose M here: the module
          will be called snd-sc6000.
 
@@ -395,16 +398,6 @@ config SND_WAVEFRONT
          To compile this driver as a module, choose M here: the module
          will be called snd-wavefront.
 
-config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-       bool "In-kernel firmware for Wavefront"
-       depends on SND_WAVEFRONT
-       default y
-       help
-         Say Y here to include the static firmware for FX DSP built in
-         the kernel for the Wavefront driver.  If you choose N here,
-         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