Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6

[linux-2.6] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 04cafd2d21179420311cd36393296f16c9d900e8..557c4de229607bb9d8f5c1eaee83c4f7ee0fbd6d 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -6,12 +6,19 @@ menu "ISA devices"
 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_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"
@@ -150,7 +157,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 +170,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 +185,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 +199,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 +212,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 +225,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 +239,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 +294,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 +301,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
        help
          Say Y here to include support for Creative Sound Blaster 1.0/
          2.0/Pro (8-bit) or 100% compatible soundcards.
@@ -322,7 +334,6 @@ config SND_SB16
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for Sound Blaster 16 soundcards
          (including the Plug and Play version).
@@ -336,7 +347,6 @@ config SND_SBAWE
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for Sound Blaster AWE soundcards
          (including the Plug and Play version).