From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/sound/synth/emux/emux_proc.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'kernel/sound/synth/emux/emux_proc.c') diff --git a/kernel/sound/synth/emux/emux_proc.c b/kernel/sound/synth/emux/emux_proc.c index 58a32a10d..a82b4053b 100644 --- a/kernel/sound/synth/emux/emux_proc.c +++ b/kernel/sound/synth/emux/emux_proc.c @@ -24,8 +24,6 @@ #include #include "emux_voice.h" -#ifdef CONFIG_PROC_FS - static void snd_emux_proc_info_read(struct snd_info_entry *entry, struct snd_info_buffer *buf) @@ -128,5 +126,3 @@ void snd_emux_proc_free(struct snd_emux *emu) snd_info_free_entry(emu->proc); emu->proc = NULL; } - -#endif /* CONFIG_PROC_FS */ -- cgit 1.2.3-korg