aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/isa/Kconfig4
-rw-r--r--sound/pci/Kconfig6
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 376c6b03d2ca..cf3803cd579c 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -358,7 +358,7 @@ config SND_SBAWE
358config SND_SB16_CSP 358config SND_SB16_CSP
359 bool "Sound Blaster 16/AWE CSP support" 359 bool "Sound Blaster 16/AWE CSP support"
360 depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC) 360 depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
361 select FW_LOADER 361 select FW_LOADER if !SND_SB16_CSP_FIRMWARE_IN_KERNEL
362 help 362 help
363 Say Y here to include support for the CSP core. This special 363 Say Y here to include support for the CSP core. This special
364 coprocessor can do variable tasks like various compression and 364 coprocessor can do variable tasks like various compression and
@@ -400,7 +400,7 @@ config SND_SSCAPE
400config SND_WAVEFRONT 400config SND_WAVEFRONT
401 tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" 401 tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
402 depends on SND 402 depends on SND
403 select FW_LOADER 403 select FW_LOADER if !SND_WAVEFRONT_FIRMWARE_IN_KERNEL
404 select SND_OPL3_LIB 404 select SND_OPL3_LIB
405 select SND_MPU401_UART 405 select SND_MPU401_UART
406 select SND_CS4231_LIB 406 select SND_CS4231_LIB
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 9ed4f2fa8fe6..61e35ecc57b8 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -576,7 +576,7 @@ config SND_INTEL8X0M
576config SND_KORG1212 576config SND_KORG1212
577 tristate "Korg 1212 IO" 577 tristate "Korg 1212 IO"
578 depends on SND 578 depends on SND
579 select FW_LOADER 579 select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
580 select SND_PCM 580 select SND_PCM
581 help 581 help
582 Say Y here to include support for Korg 1212IO soundcards. 582 Say Y here to include support for Korg 1212IO soundcards.
@@ -596,7 +596,7 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL
596config SND_MAESTRO3 596config SND_MAESTRO3
597 tristate "ESS Allegro/Maestro3" 597 tristate "ESS Allegro/Maestro3"
598 depends on SND 598 depends on SND
599 select FW_LOADER 599 select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
600 select SND_AC97_CODEC 600 select SND_AC97_CODEC
601 help 601 help
602 Say Y here to include support for soundcards based on ESS Maestro 3 602 Say Y here to include support for soundcards based on ESS Maestro 3
@@ -755,7 +755,7 @@ config SND_VX222
755config SND_YMFPCI 755config SND_YMFPCI
756 tristate "Yamaha YMF724/740/744/754" 756 tristate "Yamaha YMF724/740/744/754"
757 depends on SND 757 depends on SND
758 select FW_LOADER 758 select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
759 select SND_OPL3_LIB 759 select SND_OPL3_LIB
760 select SND_MPU401_UART 760 select SND_MPU401_UART
761 select SND_AC97_CODEC 761 select SND_AC97_CODEC