bonding: process the err returned by dev_set_allmulti properly in bond_enslave

[pandora-kernel.git] / crypto / khazad.c

diff --git a/crypto/khazad.c b/crypto/khazad.c
index 9fa24a2..ea82051 100644 (file)
--- 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,15 @@ 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");
+MODULE_ALIAS_CRYPTO("khazad");