Commit 506e6ae2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: emu10k1: Fix/cleanup ifdef CONFIG_PROC_FS 



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

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 95bb6258

sound/pci/emu10k1/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

sound/pci/emu10k1/emu10k1_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/pci/emu10k1/emuproc.c

+0 −2
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE