summaryrefslogtreecommitdiff
path: root/sound/synth/emux/emux_proc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-29 08:58:11 +0300
committerTakashi Iwai <tiwai@suse.de>2015-05-29 08:58:11 +0300
commit52262b4a5d7c3d3549985a47d96fe7d661220162 (patch)
tree7803277ddc46447456e77878e7554b6baa050035 /sound/synth/emux/emux_proc.c
parent506e6ae2561fbee9a7c8f395178c46616e93bfda (diff)
downloadlinux-52262b4a5d7c3d3549985a47d96fe7d661220162.tar.xz
ALSA: emux: Fix/cleanup old ifdef CONFIG_PROC_FS
Build emux_proc.o and drop the unneeded ifdefs. Replace the left CONFIG_PROC with the new CONFIG_SND_PROC_FS. Along with this, fix the build of emux_oss.o in Makefile, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/emux_proc.c')
-rw-r--r--sound/synth/emux/emux_proc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index 58a32a10d115..a82b4053bee8 100644
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -24,8 +24,6 @@
#include <sound/info.h>
#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 */