summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/seq_device.h4
-rw-r--r--sound/core/seq/seq_device.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h
index 2b5f24c..d524335 100644
--- a/include/sound/seq_device.h
+++ b/include/sound/seq_device.h
@@ -67,7 +67,11 @@ struct snd_seq_dev_ops {
/*
* prototypes
*/
+#ifdef CONFIG_MODULES
void snd_seq_device_load_drivers(void);
+#else
+#define snd_seq_device_load_drivers()
+#endif
int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result);
int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize);
int snd_seq_device_unregister_driver(char *id);
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index a752a79..075a66c 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -198,19 +198,16 @@ void snd_seq_autoload_init(void)
#endif
}
EXPORT_SYMBOL(snd_seq_autoload_init);
-#else
-#define try_autoload(ops) /* NOP */
-#endif
-
void snd_seq_device_load_drivers(void)
{
-#ifdef CONFIG_MODULES
queue_autoload_drivers();
flush_work(&autoload_work);
-#endif
}
EXPORT_SYMBOL(snd_seq_device_load_drivers);
+#else
+#define try_autoload(ops) /* NOP */
+#endif
/*
* register a sequencer device
OpenPOWER on IntegriCloud