net/mlx4_en: Fix mixed PFC and Global pause user control requests

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

diff --git a/crypto/serpent.c b/crypto/serpent.c
index 2b0a19a..db6beb6 100644 (file)
--- 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,16 +572,17 @@ 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");
 MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>");
-MODULE_ALIAS("tnepres");
+MODULE_ALIAS_CRYPTO("tnepres");
+MODULE_ALIAS_CRYPTO("serpent");