From 9894029db7203faf8eb4bdf144865d6e48971e08 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 28 Nov 2008 15:07:37 +0100
Subject: [PATCH] --- yaml --- r: 120521 b: refs/heads/master c:
 645f10c1ac7f733b224eaf97634edf9b20e2370e h: refs/heads/master i:   120519:
 3f7ec45c6acd92b929d425935996dc37a805df59 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1ead6473c1e7..844d95e71512 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1289e9e8b42f973f2ab39e5f4f2239ff826c27e9
+refs/heads/master: 645f10c1ac7f733b224eaf97634edf9b20e2370e
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index 4aa7b1b72877..2fff0fb77ba2 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -530,10 +530,10 @@ EXPORT_SYMBOL_GPL(snd_hda_bus_new);
 #define is_generic_config(codec)	0
 #endif
 
-#ifdef CONFIG_SND_HDA_INTEL_MODULE
+#ifdef MODULE
 #define HDA_MODREQ_MAX_COUNT	2	/* two request_modules()'s */
 #else
-#define HDA_MODREQ_MAX_COUNT	0
+#define HDA_MODREQ_MAX_COUNT	0	/* all presets are statically linked */
 #endif
 
 /*