Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[karo-tx-linux.git] / sound / oss / msnd.c

diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index 5dbfc0f9c3c7bf32abb87475283ea4c4f21c65b9..ba38d6200099f883f3f188d6e9255bf07afa80b6 100644 (file)
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -47,7 +47,7 @@
 static multisound_dev_t                *devs[MSND_MAX_DEVS];
 static int                     num_devs;
 
-int __init msnd_register(multisound_dev_t *dev)
+int msnd_register(multisound_dev_t *dev)
 {
        int i;