Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1327e2b859d725f94687f80e7719a367501b3be2
Commit:     1327e2b859d725f94687f80e7719a367501b3be2
Parent:     5d403b1923fa352b2cbaf8d0945f7ff872049dae
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Thu May 3 17:56:59 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Fri May 11 16:56:14 2007 +0200

    [ALSA] do not depend on FW_LOADER when internal firmware images are used
    
    Since request_firmware() is no longer used when the internal firmware
    images are used, it is no longer necessary to depend on FW_LOADER in
    this case.
    
    Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/isa/Kconfig |    4 ++--
 sound/pci/Kconfig |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 376c6b0..cf3803c 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -358,7 +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
+       select FW_LOADER if !SND_SB16_CSP_FIRMWARE_IN_KERNEL
        help
          Say Y here to include support for the CSP core.  This special
          coprocessor can do variable tasks like various compression and
@@ -400,7 +400,7 @@ config SND_SSCAPE
 config SND_WAVEFRONT
        tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
        depends on SND
-       select FW_LOADER
+       select FW_LOADER if !SND_WAVEFRONT_FIRMWARE_IN_KERNEL
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_CS4231_LIB
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 9ed4f2f..61e35ec 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -576,7 +576,7 @@ config SND_INTEL8X0M
 config SND_KORG1212
        tristate "Korg 1212 IO"
        depends on SND
-       select FW_LOADER
+       select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
        select SND_PCM
        help
          Say Y here to include support for Korg 1212IO soundcards.
@@ -596,7 +596,7 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL
 config SND_MAESTRO3
        tristate "ESS Allegro/Maestro3"
        depends on SND
-       select FW_LOADER
+       select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
        select SND_AC97_CODEC
        help
          Say Y here to include support for soundcards based on ESS Maestro 3
@@ -755,7 +755,7 @@ config SND_VX222
 config SND_YMFPCI
        tristate "Yamaha YMF724/740/744/754"
        depends on SND
-       select FW_LOADER
+       select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_AC97_CODEC
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to