Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 7e6cedb..557c4de 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -1,11 +1,29 @@
 # ALSA ISA drivers
 
 menu "ISA devices"
-       depends on SND!=n && ISA
+       depends on SND!=n && ISA && ISA_DMA_API
+
+config SND_AD1848_LIB
+        tristate
+        select SND_PCM
+
+config SND_CS4231_LIB
+        tristate
+        select SND_PCM
+
+config SND_ADLIB
+       tristate "AdLib FM card"
+       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"
-       depends on SND && ISAPNP
+       depends on SND && PNP && ISA
+       select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
@@ -19,7 +37,7 @@ config SND_AD1816A
 config SND_AD1848
        tristate "Generic AD1848/CS4248 driver"
        depends on SND
-       select SND_PCM
+       select SND_AD1848_LIB
        help
          Say Y here to include support for AD1848 (Analog Devices) or
          CS4248 (Cirrus Logic - Crystal Semiconductors) chips.
@@ -30,11 +48,50 @@ config SND_AD1848
          To compile this driver as a module, choose M here: the module
          will be called snd-ad1848.
 
+config SND_ALS100
+       tristate "Avance Logic ALS100/ALS120"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         Say Y here to include support for soundcards based on Avance
+         Logic ALS100, ALS110, ALS120 and ALS200 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-als100.
+
+config SND_AZT2320
+       tristate "Aztech Systems AZT2320"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_CS4231_LIB
+       help
+         Say Y here to include support for soundcards based on the
+         Aztech Systems AZT2320 chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-azt2320.
+
+config SND_CMI8330
+       tristate "C-Media CMI8330"
+       depends on SND
+       select SND_AD1848_LIB
+       help
+         Say Y here to include support for soundcards based on the
+         C-Media CMI8330 chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-cmi8330.
+
 config SND_CS4231
        tristate "Generic Cirrus Logic CS4231 driver"
        depends on SND
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y here to include support for CS4231 chips from Cirrus
          Logic - Crystal Semiconductors.
@@ -47,7 +104,7 @@ config SND_CS4232
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y here to include support for CS4232 chips from Cirrus
          Logic - Crystal Semiconductors.
@@ -60,7 +117,7 @@ config SND_CS4236
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,
          CS4239 chips from Cirrus Logic - Crystal Semiconductors.
@@ -68,9 +125,24 @@ config SND_CS4236
          To compile this driver as a module, choose M here: the module
          will be called snd-cs4236.
 
+config SND_DT019X
+       tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         Say Y here to include support for soundcards based on the
+         Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-dt019x.
+
 config SND_ES968
        tristate "Generic ESS ES968 driver"
-       depends on SND && ISAPNP
+       depends on SND && PNP && ISA
+       select ISAPNP
        select SND_MPU401_UART
        select SND_PCM
        help
@@ -138,7 +210,7 @@ config SND_GUSMAX
        tristate "Gravis UltraSound MAX"
        depends on SND
        select SND_RAWMIDI
-       select SND_PCM
+       select SND_CS4231_LIB
        select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound MAX
@@ -149,9 +221,9 @@ config SND_GUSMAX
 
 config SND_INTERWAVE
        tristate "AMD InterWave, Gravis UltraSound PnP"
-       depends on SND
+       depends on SND && PNP && ISA
        select SND_RAWMIDI
-       select SND_PCM
+       select SND_CS4231_LIB
        select SND_GUS_SYNTH
        help
          Say Y here to include support for AMD InterWave based
@@ -163,9 +235,9 @@ config SND_INTERWAVE
 
 config SND_INTERWAVE_STB
        tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
-       depends on SND
+       depends on SND && PNP && ISA
        select SND_RAWMIDI
-       select SND_PCM
+       select SND_CS4231_LIB
        select SND_GUS_SYNTH
        help
          Say Y here to include support for AMD InterWave based
@@ -175,13 +247,26 @@ config SND_INTERWAVE_STB
          To compile this driver as a module, choose M here: the module
          will be called 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
+       help
+         Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
+         chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called 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_PCM
+       select SND_AD1848_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C92x or OTI-601 chips and using an AD1848 codec.
@@ -195,7 +280,7 @@ config SND_OPTI92X_CS4231
        select SND_OPL3_LIB
        select SND_OPL4_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C92x chips and using a CS4231 codec.
@@ -216,6 +301,20 @@ 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
@@ -263,86 +362,10 @@ config SND_SB16_CSP
          coprocessor can do variable tasks like various compression and
          decompression algorithms.
 
-config SND_WAVEFRONT
-       tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for Turtle Beach Maui, Tropez
-         and Tropez+ soundcards based on the Wavefront chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-wavefront.
-
-config SND_ALS100
-       tristate "Avance Logic ALS100/ALS120"
-       depends on SND && ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on Avance
-         Logic ALS100, ALS110, ALS120 and ALS200 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-als100.
-
-config SND_AZT2320
-       tristate "Aztech Systems AZT2320"
-       depends on SND && ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on the
-         Aztech Systems AZT2320 chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-azt2320.
-
-config SND_CMI8330
-       tristate "C-Media CMI8330"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on the
-         C-Media CMI8330 chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-cmi8330.
-
-config SND_DT019X
-       tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-       depends on SND && ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on the
-         Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-dt019x.
-
-config SND_OPL3SA2
-       tristate "Yamaha OPL3-SA2/SA3"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
-         chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-opl3sa2.
-
 config SND_SGALAXY
        tristate "Aztech Sound Galaxy"
        depends on SND
-       select SND_PCM
+       select SND_AD1848_LIB
        help
          Say Y here to include support for Aztech Sound Galaxy
          soundcards.
@@ -355,7 +378,7 @@ config SND_SSCAPE
        depends on SND
        select SND_HWDEP
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y here to include support for Ensoniq SoundScape PnP
          soundcards.
@@ -363,4 +386,17 @@ config SND_SSCAPE
          To compile this driver as a module, choose M here: the module
          will be called snd-sscape.
 
+config SND_WAVEFRONT
+       tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
+       depends on SND
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_CS4231_LIB
+       help
+         Say Y here to include support for Turtle Beach Maui, Tropez
+         and Tropez+ soundcards based on the Wavefront chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-wavefront.
+
 endmenu