diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-03-12 08:30:16 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:46 +0200 |
| commit | badec46ddf7c2d1cb0b944332746828c48debe40 (patch) | |
| tree | 73be663a5725200e753c05d8562f9e76887f3990 /sound | |
| parent | 4d02031fe25c01eaa946a25e2052dd8e706edfca (diff) | |
[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>
Diffstat (limited to 'sound')
| -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 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 12dfda3123a0..b8e645812808 100644 --- 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 |