x86: vsmp fix x86 vsmp fix is vsmp box cleanup

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

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 4e3a9729f56968d7f3077c27228068521af89536..2639a6ab8f2ea122425b1b8739cfad29ac73eb2c 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,8 +1,5 @@
 # ALSA ISA drivers
 
-menu "ISA devices"
-       depends on SND!=n && ISA && ISA_DMA_API
-
 config SND_AD1848_LIB
         tristate
         select SND_PCM
@@ -11,6 +8,22 @@ config SND_CS4231_LIB
         tristate
         select SND_PCM
 
+config SND_SB_COMMON
+        tristate
+
+config SND_SB8_DSP
+        tristate
+        select SND_PCM
+        select SND_SB_COMMON
+
+config SND_SB16_DSP
+        tristate
+        select SND_PCM
+        select SND_SB_COMMON
+
+menu "ISA devices"
+       depends on SND!=n && ISA && ISA_DMA_API
+
 config SND_ADLIB
        tristate "AdLib FM card"
        depends on SND
@@ -55,7 +68,7 @@ config SND_ALS100
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_SB16_DSP
        help
          Say Y here to include support for soundcards based on Avance
          Logic ALS100, ALS110, ALS120 and ALS200 chips.
@@ -81,6 +94,7 @@ config SND_CMI8330
        tristate "C-Media CMI8330"
        depends on SND
        select SND_AD1848_LIB
+       select SND_SB16_DSP
        help
          Say Y here to include support for soundcards based on the
          C-Media CMI8330 chip.
@@ -132,7 +146,7 @@ config SND_DT019X
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_SB16_DSP
        help
          Say Y here to include support for soundcards based on the
          Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
@@ -145,7 +159,7 @@ config SND_ES968
        depends on SND && PNP && ISA
        select ISAPNP
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_SB8_DSP
        help
          Say Y here to include support for ESS AudioDrive ES968 chips.
 
@@ -177,6 +191,19 @@ config SND_ES18XX
          To compile this driver as a module, choose M here: the module
          will be called snd-es18xx.
 
+config SND_SC6000
+       tristate "Gallant SC-6000, Audio Excel DSP 16"
+       depends on SND && HAS_IOPORT
+       select SND_AD1848_LIB
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       help
+         Say Y here to include support for Gallant SC-6000 card and clones:
+         Audio Excel DSP 16 and Zoltrix AV302.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-sc6000.
+
 config SND_GUS_SYNTH
        tristate
 
@@ -321,7 +348,7 @@ config SND_SB8
        depends on SND
        select SND_OPL3_LIB
        select SND_RAWMIDI
-       select SND_PCM
+       select SND_SB8_DSP
        help
          Say Y here to include support for Creative Sound Blaster 1.0/
          2.0/Pro (8-bit) or 100% compatible soundcards.
@@ -334,7 +361,7 @@ config SND_SB16
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_SB16_DSP
        help
          Say Y here to include support for Sound Blaster 16 soundcards
          (including the Plug and Play version).
@@ -347,7 +374,7 @@ config SND_SBAWE
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_SB16_DSP
        help
          Say Y here to include support for Sound Blaster AWE soundcards
          (including the Plug and Play version).
@@ -358,12 +385,21 @@ config SND_SBAWE
 config SND_SB16_CSP
        bool "Sound Blaster 16/AWE CSP support"
        depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
-       select FW_LOADER
+       select FW_LOADER if !SND_SB16_CSP_FIRMWARE_IN_KERNEL
        help
          Say Y here to include support for the CSP core.  This special
          coprocessor can do variable tasks like various compression and
          decompression algorithms.
 
+config SND_SB16_CSP_FIRMWARE_IN_KERNEL
+       bool "In-kernel firmware for SB16 CSP"
+       depends on SND_SB16_CSP
+       default y
+       help
+         Say Y here to include the static firmware built in the kernel
+         for the SB16 CSP controller.  If you choose N here, you need
+         to install the firmware files from the alsa-firmware package.
+
 config SND_SGALAXY
        tristate "Aztech Sound Galaxy"
        depends on SND
@@ -402,4 +438,14 @@ 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.
+
 endmenu