[ALSA] Kconfig: fix FW_LOADER dependencies

Move the FW_LOADER dependencies out of the *_FIRMWARE_IN_KERNEL entries
because these drivers use the firmware loader regardless of whether
there is an in-kernel firmware image.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index c855e350789a67f893de113640fa5e14e3a36987..992e8c32508a1fa09bb83e17d47f0d4e38e20acd 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -358,6 +358,7 @@ config SND_SBAWE
 config SND_SB16_CSP
        bool "Sound Blaster 16/AWE CSP support"
        depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
+       select FW_LOADER
        help
          Say Y here to include support for the CSP core.  This special
          coprocessor can do variable tasks like various compression and
@@ -366,7 +367,6 @@ config SND_SB16_CSP
 config SND_SB16_CSP_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for SB16 CSP"
        depends on SND_SB16_CSP
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
@@ -400,6 +400,7 @@ config SND_SSCAPE
 config SND_WAVEFRONT
        tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
        depends on SND
+       select FW_LOADER
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_CS4231_LIB
@@ -413,7 +414,6 @@ config SND_WAVEFRONT
 config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for Wavefront"
        depends on SND_WAVEFRONT
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 12dfda3123a0684a4f46520f1e24c476a8849e73..b8e645812808d40d99814f2d4cc7e2573dfa4570 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -576,6 +576,7 @@ config SND_INTEL8X0M
 config SND_KORG1212
        tristate "Korg 1212 IO"
        depends on SND
+       select FW_LOADER
        select SND_PCM
        help
          Say Y here to include support for Korg 1212IO soundcards.
@@ -586,7 +587,6 @@ config SND_KORG1212
 config SND_KORG1212_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for Korg1212 driver"
        depends on SND_KORG1212
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
@@ -608,7 +608,6 @@ config SND_MAESTRO3
 config SND_MAESTRO3_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for Maestro3 driver"
        depends on SND_MAESTRO3
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
@@ -756,6 +755,7 @@ config SND_VX222
 config SND_YMFPCI
        tristate "Yamaha YMF724/740/744/754"
        depends on SND
+       select FW_LOADER
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_AC97_CODEC
@@ -769,7 +769,6 @@ config SND_YMFPCI
 config SND_YMFPCI_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for YMFPCI driver"
        depends on SND_YMFPCI
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel