USB: u132-hcd.c - Fix a warning when CONFIG_PM=n

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

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 04cafd2..ea5084a 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,17 +1,38 @@
 # ALSA ISA drivers
 
-menu "ISA devices"
-       depends on SND!=n && ISA && ISA_DMA_API
-
 config SND_AD1848_LIB
         tristate
         select SND_PCM
-       select SND_GENERIC_DRIVER
 
 config SND_CS4231_LIB
         tristate
         select SND_PCM
-       select SND_GENERIC_DRIVER
+
+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
+       select SND_OPL3_LIB
+       help
+         Say Y here to include support for AdLib FM cards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-adlib.
 
 config SND_AD1816A
        tristate "Analog Devices SoundPort AD1816A"
@@ -47,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.
@@ -73,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.
@@ -124,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.
@@ -137,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.
 
@@ -150,7 +172,6 @@ config SND_ES1688
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for ESS AudioDrive ES688 or
          ES1688 chips.
@@ -164,7 +185,6 @@ config SND_ES18XX
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for ESS AudioDrive ES18xx chips.
 
@@ -180,7 +200,6 @@ config SND_GUSCLASSIC
        select SND_RAWMIDI
        select SND_PCM
        select SND_GUS_SYNTH
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for Gravis UltraSound Classic
          soundcards.
@@ -195,7 +214,6 @@ config SND_GUSEXTREME
        select SND_MPU401_UART
        select SND_PCM
        select SND_GUS_SYNTH
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for Gravis UltraSound Extreme
          soundcards.
@@ -209,7 +227,6 @@ config SND_GUSMAX
        select SND_RAWMIDI
        select SND_CS4231_LIB
        select SND_GUS_SYNTH
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for Gravis UltraSound MAX
          soundcards.
@@ -223,7 +240,6 @@ config SND_INTERWAVE
        select SND_RAWMIDI
        select SND_CS4231_LIB
        select SND_GUS_SYNTH
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for AMD InterWave based
          soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -238,7 +254,6 @@ config SND_INTERWAVE_STB
        select SND_RAWMIDI
        select SND_CS4231_LIB
        select SND_GUS_SYNTH
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for AMD InterWave based
          soundcards with a TEA6330T bass and treble regulator
@@ -294,7 +309,6 @@ config SND_OPTI93X
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for soundcards based on Opti
          82C93x chips.
@@ -302,13 +316,26 @@ config SND_OPTI93X
          To compile this driver as a module, choose M here: the module
          will be called 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_MPU401_UART
+       select SND_PCM
+       help
+         Say 'Y' or 'M' to include support for Miro miroSOUND PCM1 pro, 
+         miroSOUND PCM12 and miroSOUND PCM20 Radio soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called 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_PCM
-       select SND_GENERIC_DRIVER
+       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.
@@ -321,8 +348,7 @@ config SND_SB16
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
-       select SND_GENERIC_DRIVER
+       select SND_SB16_DSP
        help
          Say Y here to include support for Sound Blaster 16 soundcards
          (including the Plug and Play version).
@@ -335,8 +361,7 @@ config SND_SBAWE
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
-       select SND_GENERIC_DRIVER
+       select SND_SB16_DSP
        help
          Say Y here to include support for Sound Blaster AWE soundcards
          (including the Plug and Play version).
@@ -347,11 +372,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 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
@@ -379,6 +414,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 SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_CS4231_LIB
@@ -389,4 +425,13 @@ 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 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