diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 08:58:11 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 08:58:11 +0300 |
| commit | 52262b4a5d7c3d3549985a47d96fe7d661220162 (patch) | |
| tree | 7803277ddc46447456e77878e7554b6baa050035 /sound/synth/emux/emux_voice.h | |
| parent | 506e6ae2561fbee9a7c8f395178c46616e93bfda (diff) | |
| download | linux-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_voice.h')
| -rw-r--r-- | sound/synth/emux/emux_voice.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/synth/emux/emux_voice.h b/sound/synth/emux/emux_voice.h index 09711f84ed30..a7073c371bcc 100644 --- a/sound/synth/emux/emux_voice.h +++ b/sound/synth/emux/emux_voice.h @@ -82,9 +82,13 @@ void snd_emux_init_seq_oss(struct snd_emux *emu); void snd_emux_detach_seq_oss(struct snd_emux *emu); /* emux_proc.c */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_SND_PROC_FS void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device); void snd_emux_proc_free(struct snd_emux *emu); +#else +static inline void snd_emux_proc_init(struct snd_emux *emu, + struct snd_card *card, int device) {} +static inline void snd_emux_proc_free(struct snd_emux *emu) {} #endif #define STATE_IS_PLAYING(s) ((s) & SNDRV_EMUX_ST_ON) |