From 5aa766280b6cad8cbbabfc7798d91a397cc07246 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 22 May 2006 14:31:57 +0200
Subject: [PATCH] --- yaml --- r: 28518 b: refs/heads/master c:
 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/sound/pci/rme9652/hdsp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c49e48368a6..aee807a0ca84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c00bd74a0dd69c4b39e4d95a20253e735616bdb9
+refs/heads/master: 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a
diff --git a/trunk/sound/pci/rme9652/hdsp.c b/trunk/sound/pci/rme9652/hdsp.c
index da63a1a19958..bf89ab9e3138 100644
--- a/trunk/sound/pci/rme9652/hdsp.c
+++ b/trunk/sound/pci/rme9652/hdsp.c
@@ -389,7 +389,7 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
 
 /* use hotplug firmeare loader? */
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#ifndef HDSP_USE_HWDEP_LOADER
+#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP)
 #define HDSP_FW_LOADER
 #endif
 #endif