aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2007-03-12 03:30:16 -0400
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:55:46 -0400
commitbadec46ddf7c2d1cb0b944332746828c48debe40 (patch)
tree73be663a5725200e753c05d8562f9e76887f3990 /sound/pci
parent4d02031fe25c01eaa946a25e2052dd8e706edfca (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/pci')
-rw-r--r--sound/pci/Kconfig5
1 files changed, 2 insertions, 3 deletions
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
576config SND_KORG1212 576config 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
586config SND_KORG1212_FIRMWARE_IN_KERNEL 587config 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
608config SND_MAESTRO3_FIRMWARE_IN_KERNEL 608config 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
756config SND_YMFPCI 755config 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
769config SND_YMFPCI_FIRMWARE_IN_KERNEL 769config 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