[PATCH] config USE_MIXARTLOADER has never existed in KConfig for 2.6 linux kernels so this part of the check always evaluates to true thus removing the part of the check.

[Christoph Egger]

The same is true for USE_PCXHRLOADER and USE_VXLOADER

Signed-off-by: Christoph Egger <siccegge at stud.informatik.uni-erlangen.de>
---
 include/sound/vx_core.h         |    2 +-
 sound/pci/mixart/mixart_hwdep.c |    2 +-
 sound/pci/pcxhr/pcxhr_hwdep.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 5456343..c6835dd 100644
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_VXLOADER) && !defined(CONFIG_SND_VX_LIB) /* built-in kernel */
+#if !defined(CONFIG_SND_VX_LIB) /* built-in kernel */
 #define SND_VX_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 4cf4cd8..ef39a58 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -545,7 +545,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_MIXARTLOADER) && !defined(CONFIG_SND_MIXART) /* built-in kernel */
+#if !defined(CONFIG_SND_MIXART) /* built-in kernel */
 #define SND_MIXART_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 17cb123..16152ce 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -35,7 +35,7 @@
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_PCXHRLOADER) && !defined(CONFIG_SND_PCXHR) /* built-in kernel */
+#if !defined(CONFIG_SND_PCXHR) /* built-in kernel */
 #define SND_PCXHR_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
-- 
1.6.3.3


--bCsyhTFzCvuiizWE--