X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=crypto%2Fserpent.c;h=b651a55fa569f9c913076b1b18647f5e31efd97a;hb=37a118452cbc9c0cf0d23bfd16d3ca56058be754;hp=2b0a19a44ec596047d541dbefb1cc28f67ee6b86;hpb=bdbf77d6707a52bdeff223d0a60df12d086d21d7;p=net-next-2.6.git

diff --git a/crypto/serpent.c b/crypto/serpent.c
index 2b0a19a44ec..b651a55fa56 100644
--- a/crypto/serpent.c
+++ b/crypto/serpent.c
@@ -557,7 +557,7 @@ static struct crypto_alg tnepres_alg = {
 	.cia_decrypt  		=	tnepres_decrypt } }
 };
 
-static int __init init(void)
+static int __init serpent_mod_init(void)
 {
 	int ret = crypto_register_alg(&serpent_alg);
 
@@ -572,14 +572,14 @@ static int __init init(void)
 	return ret;
 }
 
-static void __exit fini(void)
+static void __exit serpent_mod_fini(void)
 {
 	crypto_unregister_alg(&tnepres_alg);
 	crypto_unregister_alg(&serpent_alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(serpent_mod_init);
+module_exit(serpent_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm");