Skip to content

Commit

Permalink
ALSA: ca0106: Fix/cleanup ifdef CONFIG_PROC_FS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed May 29, 2015
1 parent f68ce62 commit 1c17843
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion sound/pci/ca0106/Makefile
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion sound/pci/ca0106/ca0106_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions sound/pci/ca0106/ca0106_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@
#include "ca0106.h"


#ifdef CONFIG_PROC_FS

struct snd_ca0106_category_str {
int val;
const char *name;
Expand Down Expand Up @@ -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 */

0 comments on commit 1c17843

Please sign in to comment.