Merge branch 'pmtimer-overflow' into release

[sfrench/cifs-2.6.git] / crypto / cast6.c

diff --git a/crypto/cast6.c b/crypto/cast6.c
index 5fd9420dc58e94098a9da68e0fb4488bac79742d..007d02beed67f3f2b197ee4c01bacb20a73fa71d 100644 (file)
--- a/crypto/cast6.c
+++ b/crypto/cast6.c
@@ -528,18 +528,18 @@ static struct crypto_alg alg = {
                  }
 };
 
-static int __init init(void)
+static int __init cast6_mod_init(void)
 {
        return crypto_register_alg(&alg);
 }
 
-static void __exit fini(void)
+static void __exit cast6_mod_fini(void)
 {
        crypto_unregister_alg(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(cast6_mod_init);
+module_exit(cast6_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cast6 Cipher Algorithm");