From: Takashi Iwai <[email protected]> This patch has been added to the 3.12 stable tree. If you have any objections, please let us know.
=============== commit b55447a7301b12d509df4b2909ed38d125ad83d4 upstream. ... which was introduced by the previous commit a4e9a38b, causing build errors without CONFIG_PROC_FS. Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- sound/pci/hda/patch_hdmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 300b28bb6051..0a5c288dcc57 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -553,12 +553,12 @@ static void eld_proc_free(struct hdmi_spec_per_pin *per_pin) } } #else -static inline int snd_hda_eld_proc_new(struct hdmi_spec_per_pin *per_pin, - int index) +static inline int eld_proc_new(struct hdmi_spec_per_pin *per_pin, + int index) { return 0; } -static inline void snd_hda_eld_proc_free(struct hdmi_spec_per_pin *per_pin) +static inline void eld_proc_free(struct hdmi_spec_per_pin *per_pin) { } #endif -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
