diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-23 06:47:06 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-23 06:47:06 (GMT) |
| commit | d2f927d42a87b712946dee72a0b96b6b6c6aff1d (patch) | |
| tree | 879a34767b24e65569d24cb19490a4bdcb1beace /sound/pci/hda/hda_eld.c | |
| parent | 9c77b846ec8b4e0c7107dd7f820172462dc84a61 (diff) | |
| parent | 6f0ef6ea1d11ef242de584e345355b0de756fcb2 (diff) | |
| download | linux-d2f927d42a87b712946dee72a0b96b6b6c6aff1d.tar.xz | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_eld.c')
| -rw-r--r-- | 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 */ |