ALSA: wss_lib: use wss pcm code instead of ad1848 one

[linux-2.6-block.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 25347a25d63cf7571a5db7bfb0309da0b1ac5181..cca11d5dc33beb32aa36ff237e4ce70997ff68da 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,12 +1,13 @@
 # ALSA ISA drivers
 
-config SND_AD1848_LIB
+config SND_WSS_LIB
         tristate
         select SND_PCM
 
-config SND_CS4231_LIB
+config SND_AD1848_LIB
         tristate
         select SND_PCM
+        select SND_WSS_LIB
 
 config SND_SB_COMMON
         tristate
@@ -86,7 +87,7 @@ config SND_AZT2320
        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.
@@ -108,7 +109,7 @@ config SND_CMI8330
 config SND_CS4231
        tristate "Generic Cirrus Logic CS4231 driver"
        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.
@@ -120,7 +121,7 @@ config SND_CS4232
        tristate "Generic Cirrus Logic CS4232 driver"
        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.
@@ -132,7 +133,7 @@ config SND_CS4236
        tristate "Generic Cirrus Logic CS4236+ driver"
        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.
@@ -228,7 +229,7 @@ config SND_GUSEXTREME
 config SND_GUSMAX
        tristate "Gravis UltraSound MAX"
        select SND_RAWMIDI
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Gravis UltraSound MAX
          soundcards.
@@ -240,7 +241,7 @@ config SND_INTERWAVE
        tristate "AMD InterWave, Gravis UltraSound PnP"
        depends on PNP
        select SND_RAWMIDI
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for AMD InterWave based
          soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -253,7 +254,7 @@ config SND_INTERWAVE_STB
        tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
        depends on PNP
        select SND_RAWMIDI
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for AMD InterWave based
          soundcards with a TEA6330T bass and treble regulator
@@ -266,7 +267,7 @@ config SND_OPL3SA2
        tristate "Yamaha OPL3-SA2/SA3"
        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.
@@ -292,7 +293,7 @@ config SND_OPTI92X_CS4231
        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.
@@ -304,7 +305,7 @@ config SND_OPTI93X
        tristate "OPTi 82C93x"
        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 Opti
          82C93x chips.
@@ -315,7 +316,7 @@ config SND_OPTI93X
 config SND_MIRO
        tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
        select SND_OPL4_LIB
-       select SND_CS4231_LIB
+       select SND_WSS_LIB
        select SND_MPU401_UART
        select SND_PCM
        help
@@ -370,15 +371,6 @@ config SND_SB16_CSP
          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"
        select SND_AD1848_LIB
@@ -393,7 +385,7 @@ config SND_SSCAPE
        tristate "Ensoniq SoundScape PnP driver"
        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.
@@ -406,7 +398,7 @@ config SND_WAVEFRONT
        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.