diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 07:58:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 07:58:11 +0200 |
| commit | 52262b4a5d7c3d3549985a47d96fe7d661220162 (patch) | |
| tree | 7803277ddc46447456e77878e7554b6baa050035 /sound/synth/emux/emux.c | |
| parent | 506e6ae2561fbee9a7c8f395178c46616e93bfda (diff) | |
| download | op-kernel-dev-52262b4a5d7c3d3549985a47d96fe7d661220162.zip op-kernel-dev-52262b4a5d7c3d3549985a47d96fe7d661220162.tar.gz | |
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.c')
| -rw-r--r-- | sound/synth/emux/emux.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index 4919532..9312cd8 100644 --- 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); |
