git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"
[pandora-kernel.git]
/
crypto
/
blowfish.c
diff --git
a/crypto/blowfish.c
b/crypto/blowfish.c
index
80c3fd8
..
6f5b487
100644
(file)
--- a/
crypto/blowfish.c
+++ b/
crypto/blowfish.c
@@
-465,18
+465,18
@@
static struct crypto_alg alg = {
.cia_decrypt = bf_decrypt } }
};
.cia_decrypt = bf_decrypt } }
};
-static int __init init(void)
+static int __init
blowfish_mod_
init(void)
{
return crypto_register_alg(&alg);
}
{
return crypto_register_alg(&alg);
}
-static void __exit fini(void)
+static void __exit
blowfish_mod_
fini(void)
{
crypto_unregister_alg(&alg);
}
{
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");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Blowfish Cipher Algorithm");