X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=crypto%2Fkhazad.c;h=527e4e395fc32f8f0d271b372ed93941fb6e1bcc;hb=ed9b3e3379731e9f9d2f73f3d7fd9e7d2ce3df4a;hp=9fa24a2dd6ffbee4e9c7aff2d06b6f3b51cf8388;hpb=3e2ab46df697048e222cdc046a2fa97149ca32ba;p=linux-2.6-omap-h63xx.git

diff --git a/crypto/khazad.c b/crypto/khazad.c
index 9fa24a2dd6f..527e4e395fc 100644
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -23,7 +23,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>
 
@@ -863,7 +862,7 @@ static struct crypto_alg khazad_alg = {
 	.cia_decrypt		=	khazad_decrypt } }
 };
 
-static int __init init(void)
+static int __init khazad_mod_init(void)
 {
 	int ret = 0;
 	
@@ -871,14 +870,14 @@ static int __init init(void)
 	return ret;
 }
 
-static void __exit fini(void)
+static void __exit khazad_mod_fini(void)
 {
 	crypto_unregister_alg(&khazad_alg);
 }
 
 
-module_init(init);
-module_exit(fini);
+module_init(khazad_mod_init);
+module_exit(khazad_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");