Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: emu10k1: Fix/cleanup ifdef CONFIG_PROC_FS

Browse Source 
Build emuproc.o conditionally and drop the unneeded ifdefs.
Some are replaced with the new CONFIG_SND_PROC_FS.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-05-29 07:56:42 +02:00
parent 95bb6258d6
commit 506e6ae256
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/pci/emu10k1/Makefile
View File

@ -5,7 +5,8 @@
snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
irq.o memory.o voice.o emumpu401.o emupcm.o io.o \
emuproc.o emumixer.o emufx.o timer.o p16v.o
emumixer.o emufx.o timer.o p16v.o
snd-emu10k1-$(CONFIG_SND_PROC_FS) += emuproc.o
snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
snd-emu10k1x-objs := emu10k1x.o

2
sound/pci/emu10k1/emu10k1_main.c
View File

@ -2063,7 +2063,7 @@ int snd_emu10k1_create(struct snd_card *card,
if (err < 0)
goto error;
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_SND_PROC_FS
snd_emu10k1_proc_init(emu);
#endif

2
sound/pci/emu10k1/emuproc.c
View File

@ -34,7 +34,6 @@
#include <sound/emu10k1.h>
#include "p16v.h"
#ifdef CONFIG_PROC_FS
static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,
struct snd_info_buffer *buffer,
char *title,
@ -656,4 +655,3 @@ int snd_emu10k1_proc_init(struct snd_emu10k1 *emu)
}
return 0;
}
#endif /* CONFIG_PROC_FS */