Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[sfrench/cifs-2.6.git] / crypto / tea.c

diff --git a/crypto/tea.c b/crypto/tea.c
index 1c54e26fa529342d6ee893b7636233f9c317f3ba..412bc74f8179bb2add09ece93b470ba39bfde5d6 100644 (file)
--- a/crypto/tea.c
+++ b/crypto/tea.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>
 
@@ -268,7 +267,7 @@ static struct crypto_alg xeta_alg = {
        .cia_decrypt            =       xeta_decrypt } }
 };
 
-static int __init init(void)
+static int __init tea_mod_init(void)
 {
        int ret = 0;
        
@@ -293,7 +292,7 @@ out:
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit tea_mod_fini(void)
 {
        crypto_unregister_alg(&tea_alg);
        crypto_unregister_alg(&xtea_alg);
@@ -303,8 +302,8 @@ static void __exit fini(void)
 MODULE_ALIAS("xtea");
 MODULE_ALIAS("xeta");
 
-module_init(init);
-module_exit(fini);
+module_init(tea_mod_init);
+module_exit(tea_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("TEA, XTEA & XETA Cryptographic Algorithms");