projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[linux-2.6-microblaze.git]
/
crypto
/
sha1_generic.c
diff --git
a/crypto/sha1_generic.c
b/crypto/sha1_generic.c
index
48a3c3e
..
c7c6899
100644
(file)
--- a/
crypto/sha1_generic.c
+++ b/
crypto/sha1_generic.c
@@
-23,7
+23,6
@@
#include <linux/cryptohash.h>
#include <linux/types.h>
#include <crypto/sha.h>
#include <linux/cryptohash.h>
#include <linux/types.h>
#include <crypto/sha.h>
-#include <asm/scatterlist.h>
#include <asm/byteorder.h>
struct sha1_ctx {
#include <asm/byteorder.h>
struct sha1_ctx {
@@
-121,18
+120,18
@@
static struct crypto_alg alg = {
.dia_final = sha1_final } }
};
.dia_final = sha1_final } }
};
-static int __init init(void)
+static int __init
sha1_generic_mod_
init(void)
{
return crypto_register_alg(&alg);
}
{
return crypto_register_alg(&alg);
}
-static void __exit fini(void)
+static void __exit
sha1_generic_mod_
fini(void)
{
crypto_unregister_alg(&alg);
}
{
crypto_unregister_alg(&alg);
}
-module_init(init);
-module_exit(fini);
+module_init(
sha1_generic_mod_
init);
+module_exit(
sha1_generic_mod_
fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");