Merge branch 'for-linus' of git://neil.brown.name/md

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

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 87055568ccd414f18a4d2a0bd6d3c0a8cabb5e83..660beb41f767f74a42373ba81bf1e0805c33da02 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,9 +1,5 @@
 # ALSA ISA drivers
 
-config SND_AD1848_LIB
-        tristate
-        select SND_PCM
-
 config SND_WSS_LIB
         tristate
         select SND_PCM
@@ -55,7 +51,7 @@ config SND_AD1816A
 
 config SND_AD1848
        tristate "Generic AD1848/CS4248 driver"
-       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.
@@ -96,7 +92,7 @@ config SND_AZT2320
 
 config SND_CMI8330
        tristate "C-Media CMI8330"
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        select SND_SB16_DSP
        help
          Say Y here to include support for soundcards based on the
@@ -192,7 +188,7 @@ config SND_ES18XX
 config SND_SC6000
        tristate "Gallant SC-6000, Audio Excel DSP 16"
        depends on HAS_IOPORT
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        select SND_OPL3_LIB
        select SND_MPU401_UART
        help
@@ -279,7 +275,7 @@ config SND_OPTI92X_AD1848
        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.
@@ -364,7 +360,7 @@ 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
@@ -372,7 +368,7 @@ config SND_SB16_CSP
 
 config SND_SGALAXY
        tristate "Aztech Sound Galaxy"
-       select SND_AD1848_LIB
+       select SND_WSS_LIB
        help
          Say Y here to include support for Aztech Sound Galaxy
          soundcards.