[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <s5h4oergma2.wl%tiwai@suse.de>
Date: Thu, 19 Aug 2010 08:16:21 +0200
From: Takashi Iwai <tiwai@...e.de>
To: Randy Dunlap <randy.dunlap@...cle.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: sound build error in mainline (CONFIG_PROC_FS=n)
At Wed, 18 Aug 2010 13:47:42 -0700,
Randy Dunlap wrote:
>
>
> ERROR: "hdmi_eld_update_pcm_info" [sound/pci/hda/snd-hda-codec-nvhdmi.ko] undefined!
> ERROR: "hdmi_eld_update_pcm_info" [sound/pci/hda/snd-hda-codec-intelhdmi.ko] undefined!
Thanks, fixed now with the patch below.
Takashi
>From 274714f55c023c683a6b2deedfb2209a9457f4ec Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@...e.de>
Date: Thu, 19 Aug 2010 08:11:53 +0200
Subject: [PATCH] ALSA: hda - Fix build error with CONFIG_PROC_FS=n
hdmi_eld_update_pcm_info() must be always compiled in.
Signed-off-by: Takashi Iwai <tiwai@...e.de>
---
sound/pci/hda/hda_eld.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 803b298..26c3ade 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -596,6 +596,8 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
}
EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);
+#endif /* CONFIG_PROC_FS */
+
/* update PCM info based on ELD */
void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
struct hda_pcm_stream *codec_pars)
@@ -644,5 +646,3 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);
}
EXPORT_SYMBOL_HDA(hdmi_eld_update_pcm_info);
-
-#endif /* CONFIG_PROC_FS */
--
1.7.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists