p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: core: Fix randconfig build wrt CONFIG_PROC_FS 

There are a few leftover CONFIG_PROC_FS forgotten to replace with
CONFIG_SND_PROC_FS.

Fixes: cd6a65036f ('ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS')
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-05-29 07:01:28 +02:00
parent 18fe73ef7c
commit b816db9d36
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/core/seq/Makefile
View File

@ -7,7 +7,7 @@ snd-seq-device-objs := seq_device.o
snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \ snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
seq_fifo.o seq_prioq.o seq_timer.o \ seq_fifo.o seq_prioq.o seq_timer.o \
seq_system.o seq_ports.o seq_system.o seq_ports.o
snd-seq-$(CONFIG_PROC_FS) += seq_info.o snd-seq-$(CONFIG_SND_PROC_FS) += seq_info.o
snd-seq-midi-objs := seq_midi.o snd-seq-midi-objs := seq_midi.o
snd-seq-midi-emul-objs := seq_midi_emul.o snd-seq-midi-emul-objs := seq_midi_emul.o
snd-seq-midi-event-objs := seq_midi_event.o snd-seq-midi-event-objs := seq_midi_event.o

4
sound/core/seq/seq_device.c
View File

@ -272,7 +272,7 @@ EXPORT_SYMBOL_GPL(snd_seq_driver_unregister);
static int __init seq_dev_proc_init(void) static int __init seq_dev_proc_init(void)
{ {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
info_entry = snd_info_create_module_entry(THIS_MODULE, "drivers", info_entry = snd_info_create_module_entry(THIS_MODULE, "drivers",
snd_seq_root); snd_seq_root);
if (info_entry == NULL) if (info_entry == NULL)
@ -305,7 +305,7 @@ static void __exit alsa_seq_device_exit(void)
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
cancel_work_sync(&autoload_work); cancel_work_sync(&autoload_work);
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
snd_info_free_entry(info_entry); snd_info_free_entry(info_entry);
#endif #endif
bus_unregister(&snd_seq_bus_type); bus_unregister(&snd_seq_bus_type);