1 files changed, 19 insertions, 42 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 1ff9f631084f..5769a13c1d95 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -21,12 +21,17 @@ config SND_SB16_DSP
         select SND_PCM
         select SND_SB_COMMON
 
-menu "ISA devices"
-        depends on SND!=n && ISA && ISA_DMA_API
+menuconfig SND_ISA
+        bool "ISA sound devices"
+        depends on ISA && ISA_DMA_API
+        default y
+        help
+          Support for sound devices connected via the ISA bus.
+
+if SND_ISA
 
 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.
@@ -36,7 +41,7 @@ config SND_ADLIB
 
 config SND_AD1816A
         tristate "Analog Devices SoundPort AD1816A"
-        depends on SND && PNP && ISA
+        depends on PNP
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -50,7 +55,6 @@ config SND_AD1816A
 
 config SND_AD1848
         tristate "Generic AD1848/CS4248 driver"
-        depends on SND
         select SND_AD1848_LIB
         help
           Say Y here to include support for AD1848 (Analog Devices) or
@@ -64,7 +68,7 @@ config SND_AD1848
 
 config SND_ALS100
         tristate "Avance Logic ALS100/ALS120"
-        depends on SND && PNP && ISA
+        depends on PNP
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -78,7 +82,7 @@ config SND_ALS100
 
 config SND_AZT2320
         tristate "Aztech Systems AZT2320"
-        depends on SND && PNP && ISA
+        depends on PNP
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -92,7 +96,6 @@ config SND_AZT2320
 
 config SND_CMI8330
         tristate "C-Media CMI8330"
-        depends on SND
         select SND_AD1848_LIB
         select SND_SB16_DSP
         help
@@ -104,7 +107,6 @@ config SND_CMI8330
 
 config SND_CS4231
         tristate "Generic Cirrus Logic CS4231 driver"
-        depends on SND
         select SND_MPU401_UART
         select SND_CS4231_LIB
         help
@@ -116,7 +118,6 @@ config SND_CS4231
 
 config SND_CS4232
         tristate "Generic Cirrus Logic CS4232 driver"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_CS4231_LIB
@@ -129,7 +130,6 @@ config SND_CS4232
 
 config SND_CS4236
         tristate "Generic Cirrus Logic CS4236+ driver"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_CS4231_LIB
@@ -142,7 +142,7 @@ config SND_CS4236
 
 config SND_DT019X
         tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-        depends on SND && PNP && ISA
+        depends on PNP
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -156,7 +156,7 @@ config SND_DT019X
 
 config SND_ES968
         tristate "Generic ESS ES968 driver"
-        depends on SND && PNP && ISA
+        depends on PNP
         select ISAPNP
         select SND_MPU401_UART
         select SND_SB8_DSP
@@ -168,7 +168,6 @@ config SND_ES968
 
 config SND_ES1688
         tristate "Generic ESS ES688/ES1688 driver"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
@@ -181,7 +180,6 @@ config SND_ES1688
 
 config SND_ES18XX
         tristate "Generic ESS ES18xx driver"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
@@ -193,7 +191,7 @@ config SND_ES18XX
 
 config SND_SC6000
         tristate "Gallant SC-6000, Audio Excel DSP 16"
-        depends on SND && HAS_IOPORT
+        depends on HAS_IOPORT
         select SND_AD1848_LIB
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -204,15 +202,10 @@ config SND_SC6000
           To compile this driver as a module, choose M here: the module
           will be called snd-sc6000.
 
-config SND_GUS_SYNTH
-        tristate
-
 config SND_GUSCLASSIC
         tristate "Gravis UltraSound Classic"
-        depends on SND
         select SND_RAWMIDI
         select SND_PCM
-        select SND_GUS_SYNTH
         help
           Say Y here to include support for Gravis UltraSound Classic
           soundcards.
@@ -222,11 +215,9 @@ config SND_GUSCLASSIC
 
 config SND_GUSEXTREME
         tristate "Gravis UltraSound Extreme"
-        depends on SND
         select SND_HWDEP
         select SND_MPU401_UART
         select SND_PCM
-        select SND_GUS_SYNTH
         help
           Say Y here to include support for Gravis UltraSound Extreme
           soundcards.
@@ -236,10 +227,8 @@ config SND_GUSEXTREME
 
 config SND_GUSMAX
         tristate "Gravis UltraSound MAX"
-        depends on SND
         select SND_RAWMIDI
         select SND_CS4231_LIB
-        select SND_GUS_SYNTH
         help
           Say Y here to include support for Gravis UltraSound MAX
           soundcards.
@@ -249,10 +238,9 @@ config SND_GUSMAX
 
 config SND_INTERWAVE
         tristate "AMD InterWave, Gravis UltraSound PnP"
-        depends on SND && PNP && ISA
+        depends on PNP
         select SND_RAWMIDI
         select SND_CS4231_LIB
-        select SND_GUS_SYNTH
         help
           Say Y here to include support for AMD InterWave based
           soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -263,10 +251,9 @@ config SND_INTERWAVE
 
 config SND_INTERWAVE_STB
         tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
-        depends on SND && PNP && ISA
+        depends on PNP
         select SND_RAWMIDI
         select SND_CS4231_LIB
-        select SND_GUS_SYNTH
         help
           Say Y here to include support for AMD InterWave based
           soundcards with a TEA6330T bass and treble regulator
@@ -277,7 +264,6 @@ config 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
@@ -290,7 +276,6 @@ config 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
@@ -304,7 +289,6 @@ config SND_OPTI92X_AD1848
 
 config SND_OPTI92X_CS4231
         tristate "OPTi 82C92x - CS4231"
-        depends on SND
         select SND_OPL3_LIB
         select SND_OPL4_LIB
         select SND_MPU401_UART
@@ -318,10 +302,9 @@ config SND_OPTI92X_CS4231
 
 config SND_OPTI93X
         tristate "OPTi 82C93x"
-        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 soundcards based on Opti
           82C93x chips.
@@ -331,7 +314,6 @@ config 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
@@ -345,7 +327,6 @@ config 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_SB8_DSP
@@ -358,7 +339,6 @@ config SND_SB8
 
 config SND_SB16
         tristate "Sound Blaster 16 (PnP)"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_SB16_DSP
@@ -371,7 +351,6 @@ config SND_SB16
 
 config SND_SBAWE
         tristate "Sound Blaster AWE (32,64) (PnP)"
-        depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_SB16_DSP
@@ -393,7 +372,6 @@ config SND_SB16_CSP
 
 config SND_SGALAXY
         tristate "Aztech Sound Galaxy"
-        depends on SND
         select SND_AD1848_LIB
         help
           Say Y here to include support for Aztech Sound Galaxy
@@ -404,7 +382,6 @@ config SND_SGALAXY
 
 config SND_SSCAPE
         tristate "Ensoniq SoundScape PnP driver"
-        depends on SND
         select SND_HWDEP
         select SND_MPU401_UART
         select SND_CS4231_LIB
@@ -417,7 +394,6 @@ config SND_SSCAPE
 
 config SND_WAVEFRONT
         tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
-        depends on SND
         select FW_LOADER
         select SND_OPL3_LIB
         select SND_MPU401_UART
@@ -439,4 +415,5 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
           you need to install the firmware files from the
           alsa-firmware package.
 
-endmenu
+endif   # SND_ISA
+