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
Merge branches 'for-linus' and 'for-linus-3.2' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
crypto
/
khazad.c
diff --git
a/crypto/khazad.c
b/crypto/khazad.c
index
9fa24a2
..
527e4e3
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 <linux/module.h>
#include <linux/mm.h>
#include <asm/byteorder.h>
-#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/types.h>
@@
-863,7
+862,7
@@
static struct crypto_alg khazad_alg = {
.cia_decrypt = khazad_decrypt } }
};
.cia_decrypt = khazad_decrypt } }
};
-static int __init init(void)
+static int __init
khazad_mod_
init(void)
{
int ret = 0;
{
int ret = 0;
@@
-871,14
+870,14
@@
static int __init init(void)
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
khazad_mod_
fini(void)
{
crypto_unregister_alg(&khazad_alg);
}
{
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_LICENSE("GPL");
MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");