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 git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
[pandora-kernel.git]
/
crypto
/
wp512.c
diff --git
a/crypto/wp512.c
b/crypto/wp512.c
index
727d05a
..
bff2856
100644
(file)
--- a/
crypto/wp512.c
+++ b/
crypto/wp512.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>
@@
-1147,7
+1146,7
@@
static struct crypto_alg wp256 = {
.dia_final = wp256_final } }
};
.dia_final = wp256_final } }
};
-static int __init init(void)
+static int __init
wp512_mod_
init(void)
{
int ret = 0;
{
int ret = 0;
@@
-1173,7
+1172,7
@@
out:
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
wp512_mod_
fini(void)
{
crypto_unregister_alg(&wp512);
crypto_unregister_alg(&wp384);
{
crypto_unregister_alg(&wp512);
crypto_unregister_alg(&wp384);
@@
-1183,8
+1182,8
@@
static void __exit fini(void)
MODULE_ALIAS("wp384");
MODULE_ALIAS("wp256");
MODULE_ALIAS("wp384");
MODULE_ALIAS("wp256");
-module_init(init);
-module_exit(fini);
+module_init(
wp512_mod_
init);
+module_exit(
wp512_mod_
fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm");