From d8864a2bfee74ef80a36e22fb04b221a05a17751 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Thu, 3 May 2007 17:56:59 +0200
Subject: [PATCH] --- yaml --- r: 56201 b: refs/heads/master c:
 1327e2b859d725f94687f80e7719a367501b3be2 h: refs/heads/master i:   56199:
 26ea07d48898176a6e3d006f7def22776387b5cf v: v3

---
 [refs]                  | 2 +-
 trunk/sound/isa/Kconfig | 4 ++--
 trunk/sound/pci/Kconfig | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 06941248453a..544390e6d03e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d403b1923fa352b2cbaf8d0945f7ff872049dae
+refs/heads/master: 1327e2b859d725f94687f80e7719a367501b3be2
diff --git a/trunk/sound/isa/Kconfig b/trunk/sound/isa/Kconfig
index 376c6b03d2ca..cf3803cd579c 100644
--- a/trunk/sound/isa/Kconfig
+++ b/trunk/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/trunk/sound/pci/Kconfig b/trunk/sound/pci/Kconfig
index 9ed4f2fa8fe6..61e35ecc57b8 100644
--- a/trunk/sound/pci/Kconfig
+++ b/trunk/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