FRV: Make NOMMU-mode work with base addresses other than 0xC0000000 [try #2]

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

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index b90ddabae2e96e94435c84716e992166f7cb3f1b..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
@@ -24,6 +21,9 @@ config SND_SB16_DSP
         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
@@ -191,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
 
@@ -414,7 +427,7 @@ config SND_SSCAPE
 config SND_WAVEFRONT
        tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
        depends on SND
-       select FW_LOADER if !SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+       select FW_LOADER
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_CS4231_LIB
@@ -430,8 +443,9 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
        depends on SND_WAVEFRONT
        default y
        help
-         Say Y here to include the static firmware 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.
+         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