redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Takashi Iwai 2015-05-29 07:53:52 +02:00
parent f68ce62997
commit 1c1784387a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/pci/ca0106/Makefile
View File

@ -1,3 +1,4 @@
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

2
sound/pci/ca0106/ca0106_main.c
View File

@ -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

4
sound/pci/ca0106/ca0106_proc.c
View File

@ -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 */