ALSA: Convert to snd_card_create() in sound/isa/*

[safe/jmp/linux-2.6] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 6b6aa2c..ce0aa04 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,10 +1,6 @@
 # ALSA ISA drivers
 
-config SND_AD1848_LIB
-        tristate
-        select SND_PCM
-
-config SND_CS4231_LIB
+config SND_WSS_LIB
         tristate
         select SND_PCM
 
@@ -21,12 +17,17 @@ config SND_SB16_DSP
         select SND_PCM
         select SND_SB_COMMON
 
-menu "ISA devices"
-       depends on SND!=n && ISA && ISA_DMA_API
+menuconfig SND_ISA
+       bool "ISA sound devices"
+       depends on ISA && ISA_DMA_API
+       default y
+       help
+         Support for sound devices connected via the ISA bus.
+
+if SND_ISA
 
 config SND_ADLIB
        tristate "AdLib FM card"
-       depends on SND
        select SND_OPL3_LIB
        help
          Say Y here to include support for AdLib FM cards.
@@ -36,7 +37,7 @@ config SND_ADLIB
 
 config SND_AD1816A
        tristate "Analog Devices SoundPort AD1816A"
-       depends on SND && PNP && ISA
+       depends on PNP
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
@@ -50,8 +51,7 @@ config SND_AD1816A
 
 config SND_AD1848
        tristate "Generic AD1848/CS4248 driver"
-       depends on SND
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for AD1848 (Analog Devices) or
          CS4248 (Cirrus Logic - Crystal Semiconductors) chips.
@@ -64,7 +64,7 @@ config SND_AD1848
 
 config SND_ALS100
        tristate "Avance Logic ALS100/ALS120"
-       depends on SND && PNP && ISA
+       depends on PNP
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
@@ -78,11 +78,11 @@ config SND_ALS100
 
 config SND_AZT2320
        tristate "Aztech Systems AZT2320"
-       depends on SND && PNP && ISA
+       depends on PNP
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for soundcards based on the
          Aztech Systems AZT2320 chip.
@@ -92,8 +92,7 @@ config SND_AZT2320
 
 config SND_CMI8330
        tristate "C-Media CMI8330"
-       depends on SND
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        select SND_SB16_DSP
        help
          Say Y here to include support for soundcards based on the
@@ -104,9 +103,8 @@ config SND_CMI8330
 
 config SND_CS4231
        tristate "Generic Cirrus Logic CS4231 driver"
-       depends on SND
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for CS4231 chips from Cirrus
          Logic - Crystal Semiconductors.
@@ -116,10 +114,9 @@ config SND_CS4231
 
 config SND_CS4232
        tristate "Generic Cirrus Logic CS4232 driver"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for CS4232 chips from Cirrus
          Logic - Crystal Semiconductors.
@@ -129,10 +126,9 @@ config SND_CS4232
 
 config SND_CS4236
        tristate "Generic Cirrus Logic CS4236+ driver"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,
          CS4239 chips from Cirrus Logic - Crystal Semiconductors.
@@ -142,7 +138,7 @@ config SND_CS4236
 
 config SND_DT019X
        tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-       depends on SND && PNP && ISA
+       depends on PNP
        select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
@@ -156,7 +152,7 @@ config SND_DT019X
 
 config SND_ES968
        tristate "Generic ESS ES968 driver"
-       depends on SND && PNP && ISA
+       depends on PNP
        select ISAPNP
        select SND_MPU401_UART
        select SND_SB8_DSP
@@ -168,7 +164,6 @@ config SND_ES968
 
 config SND_ES1688
        tristate "Generic ESS ES688/ES1688 driver"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
@@ -181,7 +176,6 @@ config SND_ES1688
 
 config SND_ES18XX
        tristate "Generic ESS ES18xx driver"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
@@ -191,15 +185,23 @@ config SND_ES18XX
          To compile this driver as a module, choose M here: the module
          will be called snd-es18xx.
 
-config SND_GUS_SYNTH
-       tristate
+config SND_SC6000
+       tristate "Gallant SC-6000, 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:
+         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_GUSCLASSIC
        tristate "Gravis UltraSound Classic"
-       depends on SND
        select SND_RAWMIDI
        select SND_PCM
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound Classic
          soundcards.
@@ -209,11 +211,9 @@ config SND_GUSCLASSIC
 
 config SND_GUSEXTREME
        tristate "Gravis UltraSound Extreme"
-       depends on SND
-       select SND_HWDEP
+       select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound Extreme
          soundcards.
@@ -223,10 +223,8 @@ config SND_GUSEXTREME
 
 config SND_GUSMAX
        tristate "Gravis UltraSound MAX"
-       depends on SND
        select SND_RAWMIDI
-       select SND_CS4231_LIB
-       select SND_GUS_SYNTH
+       select SND_WSS_LIB
        help
          Say Y here to include support for Gravis UltraSound MAX
          soundcards.
@@ -236,10 +234,9 @@ config SND_GUSMAX
 
 config SND_INTERWAVE
        tristate "AMD InterWave, Gravis UltraSound PnP"
-       depends on SND && PNP && ISA
+       depends on PNP
        select SND_RAWMIDI
-       select SND_CS4231_LIB
-       select SND_GUS_SYNTH
+       select SND_WSS_LIB
        help
          Say Y here to include support for AMD InterWave based
          soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -250,10 +247,9 @@ config SND_INTERWAVE
 
 config SND_INTERWAVE_STB
        tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
-       depends on SND && PNP && ISA
+       depends on PNP
        select SND_RAWMIDI
-       select SND_CS4231_LIB
-       select SND_GUS_SYNTH
+       select SND_WSS_LIB
        help
          Say Y here to include support for AMD InterWave based
          soundcards with a TEA6330T bass and treble regulator
@@ -264,10 +260,9 @@ config SND_INTERWAVE_STB
 
 config SND_OPL3SA2
        tristate "Yamaha OPL3-SA2/SA3"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
          chips.
@@ -277,11 +272,10 @@ config SND_OPL3SA2
 
 config SND_OPTI92X_AD1848
        tristate "OPTi 82C92x - AD1848"
-       depends on SND
        select SND_OPL3_LIB
        select SND_OPL4_LIB
        select SND_MPU401_UART
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C92x or OTI-601 chips and using an AD1848 codec.
@@ -291,11 +285,10 @@ config SND_OPTI92X_AD1848
 
 config SND_OPTI92X_CS4231
        tristate "OPTi 82C92x - CS4231"
-       depends on SND
        select SND_OPL3_LIB
        select SND_OPL4_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C92x chips and using a CS4231 codec.
@@ -305,10 +298,9 @@ config SND_OPTI92X_CS4231
 
 config SND_OPTI93X
        tristate "OPTi 82C93x"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_WSS_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C93x chips.
@@ -318,9 +310,8 @@ config SND_OPTI93X
 
 config SND_MIRO
        tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
-       depends on SND
        select SND_OPL4_LIB
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        select SND_MPU401_UART
        select SND_PCM
        help
@@ -332,7 +323,6 @@ config SND_MIRO
 
 config SND_SB8
        tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
-       depends on SND
        select SND_OPL3_LIB
        select SND_RAWMIDI
        select SND_SB8_DSP
@@ -345,7 +335,6 @@ config SND_SB8
 
 config SND_SB16
        tristate "Sound Blaster 16 (PnP)"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_SB16_DSP
@@ -358,7 +347,6 @@ config SND_SB16
 
 config SND_SBAWE
        tristate "Sound Blaster AWE (32,64) (PnP)"
-       depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_SB16_DSP
@@ -372,25 +360,15 @@ 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 if !SND_SB16_CSP_FIRMWARE_IN_KERNEL
+       select FW_LOADER
        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
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Aztech Sound Galaxy
          soundcards.
@@ -400,10 +378,9 @@ config SND_SGALAXY
 
 config SND_SSCAPE
        tristate "Ensoniq SoundScape PnP driver"
-       depends on SND
        select SND_HWDEP
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Ensoniq SoundScape PnP
          soundcards.
@@ -413,11 +390,10 @@ config SND_SSCAPE
 
 config SND_WAVEFRONT
        tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
-       depends on SND
        select FW_LOADER
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Turtle Beach Maui, Tropez
          and Tropez+ soundcards based on the Wavefront chip.
@@ -435,4 +411,5 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
          you need to install the firmware files from the
          alsa-firmware package.
 
-endmenu
+endif  # SND_ISA
+