X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=crypto%2Fblowfish.c;h=6f5b487319220ebd3bfe9caef96c169e019b7ac2;hb=a06d568f7c5e40e34ea64881842deb8f4382babf;hp=55238c4e37f039c59872d5b049707a41cebc5160;hpb=560c06ae1ab7c677002ea3b6ac83521bf12ee07d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index 55238c4..6f5b487 100644
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>
 
@@ -466,18 +465,18 @@ static struct crypto_alg alg = {
 	.cia_decrypt  		=	bf_decrypt } }
 };
 
-static int __init init(void)
+static int __init blowfish_mod_init(void)
 {
 	return crypto_register_alg(&alg);
 }
 
-static void __exit fini(void)
+static void __exit blowfish_mod_fini(void)
 {
 	crypto_unregister_alg(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(blowfish_mod_init);
+module_exit(blowfish_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Blowfish Cipher Algorithm");