[PATCH] use select in sound/isa/Kconfig

In sound/isa/Kconfig, select ISAPNP and depend on ISAPNP are intermixed,
resulting in funny behaviour.  (Soundcarts get selectable if other
soundcards are selected).

This patch changes the "depend on ISAPNP"s to select.

Signed-Off-By: Bodo Eggert <7eggert@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index be4ea60..5c39483 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -15,7 +15,8 @@ config SND_CS4231_LIB
 
 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
@@ -80,7 +81,8 @@ config SND_CS4236
 
 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
@@ -160,7 +162,7 @@ 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_CS4231_LIB
        select SND_GUS_SYNTH
@@ -175,7 +177,7 @@ 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_CS4231_LIB
        select SND_GUS_SYNTH
@@ -291,7 +293,8 @@ config SND_WAVEFRONT
 
 config SND_ALS100
        tristate "Avance Logic ALS100/ALS120"
-       depends on SND && ISAPNP
+       depends on SND && PNP && ISA
+       select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
@@ -304,7 +307,8 @@ config SND_ALS100
 
 config SND_AZT2320
        tristate "Aztech Systems AZT2320"
-       depends on SND && ISAPNP
+       depends on SND && PNP && ISA
+       select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_CS4231_LIB
@@ -328,7 +332,8 @@ config SND_CMI8330
 
 config SND_DT019X
        tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-       depends on SND && ISAPNP
+       depends on SND && PNP && ISA
+       select ISAPNP
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM