Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit badec46d authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[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: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 4d02031f

sound/isa/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

sound/pci/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -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