aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorBodo Eggert <7eggert@gmx.de>2005-09-06 18:16:39 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:19 -0400
commit8dbfc5cfdcac04d656f6f6789eb8fcdcc3d2dfda (patch)
tree514031fbfd2896b3ad1b03e4d23b20c2132d91ab /sound/isa
parent820249bafe441dce5336ad544a5e709df42fceb5 (diff)
[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>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/Kconfig19
1 files changed, 12 insertions, 7 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index be4ea60a3679..5c3948311528 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -15,7 +15,8 @@ config SND_CS4231_LIB
15 15
16config SND_AD1816A 16config SND_AD1816A
17 tristate "Analog Devices SoundPort AD1816A" 17 tristate "Analog Devices SoundPort AD1816A"
18 depends on SND && ISAPNP 18 depends on SND && PNP && ISA
19 select ISAPNP
19 select SND_OPL3_LIB 20 select SND_OPL3_LIB
20 select SND_MPU401_UART 21 select SND_MPU401_UART
21 select SND_PCM 22 select SND_PCM
@@ -80,7 +81,8 @@ config SND_CS4236
80 81
81config SND_ES968 82config SND_ES968
82 tristate "Generic ESS ES968 driver" 83 tristate "Generic ESS ES968 driver"
83 depends on SND && ISAPNP 84 depends on SND && PNP && ISA
85 select ISAPNP
84 select SND_MPU401_UART 86 select SND_MPU401_UART
85 select SND_PCM 87 select SND_PCM
86 help 88 help
@@ -160,7 +162,7 @@ config SND_GUSMAX
160 162
161config SND_INTERWAVE 163config SND_INTERWAVE
162 tristate "AMD InterWave, Gravis UltraSound PnP" 164 tristate "AMD InterWave, Gravis UltraSound PnP"
163 depends on SND 165 depends on SND && PNP && ISA
164 select SND_RAWMIDI 166 select SND_RAWMIDI
165 select SND_CS4231_LIB 167 select SND_CS4231_LIB
166 select SND_GUS_SYNTH 168 select SND_GUS_SYNTH
@@ -175,7 +177,7 @@ config SND_INTERWAVE
175 177
176config SND_INTERWAVE_STB 178config SND_INTERWAVE_STB
177 tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)" 179 tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
178 depends on SND 180 depends on SND && PNP && ISA
179 select SND_RAWMIDI 181 select SND_RAWMIDI
180 select SND_CS4231_LIB 182 select SND_CS4231_LIB
181 select SND_GUS_SYNTH 183 select SND_GUS_SYNTH
@@ -291,7 +293,8 @@ config SND_WAVEFRONT
291 293
292config SND_ALS100 294config SND_ALS100
293 tristate "Avance Logic ALS100/ALS120" 295 tristate "Avance Logic ALS100/ALS120"
294 depends on SND && ISAPNP 296 depends on SND && PNP && ISA
297 select ISAPNP
295 select SND_OPL3_LIB 298 select SND_OPL3_LIB
296 select SND_MPU401_UART 299 select SND_MPU401_UART
297 select SND_PCM 300 select SND_PCM
@@ -304,7 +307,8 @@ config SND_ALS100
304 307
305config SND_AZT2320 308config SND_AZT2320
306 tristate "Aztech Systems AZT2320" 309 tristate "Aztech Systems AZT2320"
307 depends on SND && ISAPNP 310 depends on SND && PNP && ISA
311 select ISAPNP
308 select SND_OPL3_LIB 312 select SND_OPL3_LIB
309 select SND_MPU401_UART 313 select SND_MPU401_UART
310 select SND_CS4231_LIB 314 select SND_CS4231_LIB
@@ -328,7 +332,8 @@ config SND_CMI8330
328 332
329config SND_DT019X 333config SND_DT019X
330 tristate "Diamond Technologies DT-019X, Avance Logic ALS-007" 334 tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
331 depends on SND && ISAPNP 335 depends on SND && PNP && ISA
336 select ISAPNP
332 select SND_OPL3_LIB 337 select SND_OPL3_LIB
333 select SND_MPU401_UART 338 select SND_MPU401_UART
334 select SND_PCM 339 select SND_PCM