From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751402Ab0HSGQY (ORCPT ); Thu, 19 Aug 2010 02:16:24 -0400 Received: from cantor.suse.de ([195.135.220.2]:54423 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885Ab0HSGQW convert rfc822-to-8bit (ORCPT ); Thu, 19 Aug 2010 02:16:22 -0400 Date: Thu, 19 Aug 2010 08:16:21 +0200 Message-ID: From: Takashi Iwai To: Randy Dunlap Cc: Linux Kernel Mailing List Subject: Re: sound build error in mainline (CONFIG_PROC_FS=n) In-Reply-To: <4C6C46EE.5010006@oracle.com> References: <4C6C46EE.5010006@oracle.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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