mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
[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>
This commit is contained in:
parent
4d02031fe2
commit
badec46ddf
2 changed files with 4 additions and 5 deletions
|
@ -358,6 +358,7 @@ config SND_SBAWE
|
||||||
config SND_SB16_CSP
|
config SND_SB16_CSP
|
||||||
bool "Sound Blaster 16/AWE CSP support"
|
bool "Sound Blaster 16/AWE CSP support"
|
||||||
depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
|
depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
|
||||||
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
Say Y here to include support for the CSP core. This special
|
Say Y here to include support for the CSP core. This special
|
||||||
coprocessor can do variable tasks like various compression and
|
coprocessor can do variable tasks like various compression and
|
||||||
|
@ -366,7 +367,6 @@ config SND_SB16_CSP
|
||||||
config SND_SB16_CSP_FIRMWARE_IN_KERNEL
|
config SND_SB16_CSP_FIRMWARE_IN_KERNEL
|
||||||
bool "In-kernel firmware for SB16 CSP"
|
bool "In-kernel firmware for SB16 CSP"
|
||||||
depends on SND_SB16_CSP
|
depends on SND_SB16_CSP
|
||||||
select FW_LOADER
|
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Say Y here to include the static firmware built in the kernel
|
Say Y here to include the static firmware built in the kernel
|
||||||
|
@ -400,6 +400,7 @@ config SND_SSCAPE
|
||||||
config SND_WAVEFRONT
|
config SND_WAVEFRONT
|
||||||
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
|
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
|
||||||
depends on SND
|
depends on SND
|
||||||
|
select FW_LOADER
|
||||||
select SND_OPL3_LIB
|
select SND_OPL3_LIB
|
||||||
select SND_MPU401_UART
|
select SND_MPU401_UART
|
||||||
select SND_CS4231_LIB
|
select SND_CS4231_LIB
|
||||||
|
@ -413,7 +414,6 @@ config SND_WAVEFRONT
|
||||||
config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
|
config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
|
||||||
bool "In-kernel firmware for Wavefront"
|
bool "In-kernel firmware for Wavefront"
|
||||||
depends on SND_WAVEFRONT
|
depends on SND_WAVEFRONT
|
||||||
select FW_LOADER
|
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Say Y here to include the static firmware built in the kernel
|
Say Y here to include the static firmware built in the kernel
|
||||||
|
|
|
@ -576,6 +576,7 @@ config SND_INTEL8X0M
|
||||||
config SND_KORG1212
|
config SND_KORG1212
|
||||||
tristate "Korg 1212 IO"
|
tristate "Korg 1212 IO"
|
||||||
depends on SND
|
depends on SND
|
||||||
|
select FW_LOADER
|
||||||
select SND_PCM
|
select SND_PCM
|
||||||
help
|
help
|
||||||
Say Y here to include support for Korg 1212IO soundcards.
|
Say Y here to include support for Korg 1212IO soundcards.
|
||||||
|
@ -586,7 +587,6 @@ config SND_KORG1212
|
||||||
config SND_KORG1212_FIRMWARE_IN_KERNEL
|
config SND_KORG1212_FIRMWARE_IN_KERNEL
|
||||||
bool "In-kernel firmware for Korg1212 driver"
|
bool "In-kernel firmware for Korg1212 driver"
|
||||||
depends on SND_KORG1212
|
depends on SND_KORG1212
|
||||||
select FW_LOADER
|
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Say Y here to include the static firmware built in the kernel
|
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
|
config SND_MAESTRO3_FIRMWARE_IN_KERNEL
|
||||||
bool "In-kernel firmware for Maestro3 driver"
|
bool "In-kernel firmware for Maestro3 driver"
|
||||||
depends on SND_MAESTRO3
|
depends on SND_MAESTRO3
|
||||||
select FW_LOADER
|
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Say Y here to include the static firmware built in the kernel
|
Say Y here to include the static firmware built in the kernel
|
||||||
|
@ -756,6 +755,7 @@ config SND_VX222
|
||||||
config SND_YMFPCI
|
config SND_YMFPCI
|
||||||
tristate "Yamaha YMF724/740/744/754"
|
tristate "Yamaha YMF724/740/744/754"
|
||||||
depends on SND
|
depends on SND
|
||||||
|
select FW_LOADER
|
||||||
select SND_OPL3_LIB
|
select SND_OPL3_LIB
|
||||||
select SND_MPU401_UART
|
select SND_MPU401_UART
|
||||||
select SND_AC97_CODEC
|
select SND_AC97_CODEC
|
||||||
|
@ -769,7 +769,6 @@ config SND_YMFPCI
|
||||||
config SND_YMFPCI_FIRMWARE_IN_KERNEL
|
config SND_YMFPCI_FIRMWARE_IN_KERNEL
|
||||||
bool "In-kernel firmware for YMFPCI driver"
|
bool "In-kernel firmware for YMFPCI driver"
|
||||||
depends on SND_YMFPCI
|
depends on SND_YMFPCI
|
||||||
select FW_LOADER
|
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Say Y here to include the static firmware built in the kernel
|
Say Y here to include the static firmware built in the kernel
|
||||||
|
|
Loading…
Reference in a new issue