Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux

[firefly-linux-kernel-4.4.55.git] / sound / synth / emux / emux.c

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 49195325fdf6c6f7fe74ac50e3e4c3466c4ff60d..9312cd8a6fdd11b6c9749e97e0fee3b8ce9f0000 100644 (file)
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -128,9 +128,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
 #endif
        snd_emux_init_virmidi(emu, card);
 
-#ifdef CONFIG_PROC_FS
        snd_emux_proc_init(emu, card, index);
-#endif
        return 0;
 }
 
@@ -150,9 +148,7 @@ int snd_emux_free(struct snd_emux *emu)
                del_timer(&emu->tlist);
        spin_unlock_irqrestore(&emu->voice_lock, flags);
 
-#ifdef CONFIG_PROC_FS
        snd_emux_proc_free(emu);
-#endif
        snd_emux_delete_virmidi(emu);
 #ifdef CONFIG_SND_SEQUENCER_OSS
        snd_emux_detach_seq_oss(emu);