Commit 1c178438 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ca0106: Fix/cleanup ifdef CONFIG_PROC_FS 



Build ca0106_proc.o conditionally to drop unneeded ifdef.
Some are replaced with the new CONFIG_SND_PROC_FS.

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

sound/pci/ca0106/Makefile

+2 −1
Original line number Diff line number Diff line 
snd-ca0106-objs := ca0106_main.o ca0106_proc.o ca0106_mixer.o ca_midi.o

snd-ca0106-objs := ca0106_main.o ca0106_mixer.o ca_midi.o

snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o



obj-$(CONFIG_SND_CA0106) += snd-ca0106.o

sound/pci/ca0106/ca0106_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1885,7 +1885,7 @@ static int snd_ca0106_probe(struct pci_dev *pci, 
		goto error;

	dev_dbg(card->dev, " done.\n");



#ifdef CONFIG_PROC_FS

#ifdef CONFIG_SND_PROC_FS

	snd_ca0106_proc_init(chip);

#endif

sound/pci/ca0106/ca0106_proc.c

+0 −4
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ 
#include "ca0106.h"





#ifdef CONFIG_PROC_FS



struct snd_ca0106_category_str {

	int val;

	const char *name;
@@ -453,5 +451,3 @@ int snd_ca0106_proc_init(struct snd_ca0106 *emu) 
		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read2);

	return 0;

}
 


#endif /* CONFIG_PROC_FS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE