diff options
-rw-r--r-- | sound/isa/Kconfig | 4 | ||||
-rw-r--r-- | sound/pci/Kconfig | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index c855e350789a..992e8c32508a 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
@@ -358,6 +358,7 @@ config SND_SBAWE | |||
358 | config SND_SB16_CSP | 358 | config 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 | help | 362 | help |
362 | 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 |
363 | coprocessor can do variable tasks like various compression and | 364 | coprocessor can do variable tasks like various compression and |
@@ -366,7 +367,6 @@ config SND_SB16_CSP | |||
366 | config SND_SB16_CSP_FIRMWARE_IN_KERNEL | 367 | config SND_SB16_CSP_FIRMWARE_IN_KERNEL |
367 | bool "In-kernel firmware for SB16 CSP" | 368 | bool "In-kernel firmware for SB16 CSP" |
368 | depends on SND_SB16_CSP | 369 | depends on SND_SB16_CSP |
369 | select FW_LOADER | ||
370 | default y | 370 | default y |
371 | help | 371 | help |
372 | Say Y here to include the static firmware built in the kernel | 372 | Say Y here to include the static firmware built in the kernel |
@@ -400,6 +400,7 @@ config SND_SSCAPE | |||
400 | config SND_WAVEFRONT | 400 | config 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 SND_OPL3_LIB | 404 | select SND_OPL3_LIB |
404 | select SND_MPU401_UART | 405 | select SND_MPU401_UART |
405 | select SND_CS4231_LIB | 406 | select SND_CS4231_LIB |
@@ -413,7 +414,6 @@ config SND_WAVEFRONT | |||
413 | config SND_WAVEFRONT_FIRMWARE_IN_KERNEL | 414 | config SND_WAVEFRONT_FIRMWARE_IN_KERNEL |
414 | bool "In-kernel firmware for Wavefront" | 415 | bool "In-kernel firmware for Wavefront" |
415 | depends on SND_WAVEFRONT | 416 | depends on SND_WAVEFRONT |
416 | select FW_LOADER | ||
417 | default y | 417 | default y |
418 | help | 418 | help |
419 | Say Y here to include the static firmware built in the kernel | 419 | Say Y here to include the static firmware built in the kernel |
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 12dfda3123a0..b8e645812808 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -576,6 +576,7 @@ config SND_INTEL8X0M | |||
576 | config SND_KORG1212 | 576 | config 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 SND_PCM | 580 | select SND_PCM |
580 | help | 581 | help |
581 | Say Y here to include support for Korg 1212IO soundcards. | 582 | Say Y here to include support for Korg 1212IO soundcards. |
@@ -586,7 +587,6 @@ config SND_KORG1212 | |||
586 | config SND_KORG1212_FIRMWARE_IN_KERNEL | 587 | config SND_KORG1212_FIRMWARE_IN_KERNEL |
587 | bool "In-kernel firmware for Korg1212 driver" | 588 | bool "In-kernel firmware for Korg1212 driver" |
588 | depends on SND_KORG1212 | 589 | depends on SND_KORG1212 |
589 | select FW_LOADER | ||
590 | default y | 590 | default y |
591 | help | 591 | help |
592 | Say Y here to include the static firmware built in the kernel | 592 | Say Y here to include the static firmware built in the kernel |
@@ -608,7 +608,6 @@ config SND_MAESTRO3 | |||
608 | config SND_MAESTRO3_FIRMWARE_IN_KERNEL | 608 | config SND_MAESTRO3_FIRMWARE_IN_KERNEL |
609 | bool "In-kernel firmware for Maestro3 driver" | 609 | bool "In-kernel firmware for Maestro3 driver" |
610 | depends on SND_MAESTRO3 | 610 | depends on SND_MAESTRO3 |
611 | select FW_LOADER | ||
612 | default y | 611 | default y |
613 | help | 612 | help |
614 | Say Y here to include the static firmware built in the kernel | 613 | Say Y here to include the static firmware built in the kernel |
@@ -756,6 +755,7 @@ config SND_VX222 | |||
756 | config SND_YMFPCI | 755 | config SND_YMFPCI |
757 | tristate "Yamaha YMF724/740/744/754" | 756 | tristate "Yamaha YMF724/740/744/754" |
758 | depends on SND | 757 | depends on SND |
758 | select FW_LOADER | ||
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 |
@@ -769,7 +769,6 @@ config SND_YMFPCI | |||
769 | config SND_YMFPCI_FIRMWARE_IN_KERNEL | 769 | config SND_YMFPCI_FIRMWARE_IN_KERNEL |
770 | bool "In-kernel firmware for YMFPCI driver" | 770 | bool "In-kernel firmware for YMFPCI driver" |
771 | depends on SND_YMFPCI | 771 | depends on SND_YMFPCI |
772 | select FW_LOADER | ||
773 | default y | 772 | default y |
774 | help | 773 | help |
775 | Say Y here to include the static firmware built in the kernel | 774 | Say Y here to include the static firmware built in the kernel |