tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Bodo Eggert and committed by
Linus Torvalds 8dbfc5cf 820249ba

+12 -7
+12 -7
sound/isa/Kconfig
··· 15 15 16 16 config SND_AD1816A 17 17 tristate "Analog Devices SoundPort AD1816A" 18 - depends on SND && ISAPNP 18 + depends on SND && PNP && ISA 19 + select ISAPNP 19 20 select SND_OPL3_LIB 20 21 select SND_MPU401_UART 21 22 select SND_PCM ··· 81 80 82 81 config SND_ES968 83 82 tristate "Generic ESS ES968 driver" 84 - depends on SND && ISAPNP 83 + depends on SND && PNP && ISA 84 + select ISAPNP 85 85 select SND_MPU401_UART 86 86 select SND_PCM 87 87 help ··· 162 160 163 161 config SND_INTERWAVE 164 162 tristate "AMD InterWave, Gravis UltraSound PnP" 165 - depends on SND 163 + depends on SND && PNP && ISA 166 164 select SND_RAWMIDI 167 165 select SND_CS4231_LIB 168 166 select SND_GUS_SYNTH ··· 177 175 178 176 config SND_INTERWAVE_STB 179 177 tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)" 180 - depends on SND 178 + depends on SND && PNP && ISA 181 179 select SND_RAWMIDI 182 180 select SND_CS4231_LIB 183 181 select SND_GUS_SYNTH ··· 293 291 294 292 config SND_ALS100 295 293 tristate "Avance Logic ALS100/ALS120" 296 - depends on SND && ISAPNP 294 + depends on SND && PNP && ISA 295 + select ISAPNP 297 296 select SND_OPL3_LIB 298 297 select SND_MPU401_UART 299 298 select SND_PCM ··· 307 304 308 305 config SND_AZT2320 309 306 tristate "Aztech Systems AZT2320" 310 - depends on SND && ISAPNP 307 + depends on SND && PNP && ISA 308 + select ISAPNP 311 309 select SND_OPL3_LIB 312 310 select SND_MPU401_UART 313 311 select SND_CS4231_LIB ··· 332 328 333 329 config SND_DT019X 334 330 tristate "Diamond Technologies DT-019X, Avance Logic ALS-007" 335 - depends on SND && ISAPNP 331 + depends on SND && PNP && ISA 332 + select ISAPNP 336 333 select SND_OPL3_LIB 337 334 select SND_MPU401_UART 338 335 select SND_PCM