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/lethal/sh-2.6
[pandora-kernel.git]
/
crypto
/
hash.c
diff --git
a/crypto/hash.c
b/crypto/hash.c
index
4fd470b
..
7dcff67
100644
(file)
--- a/
crypto/hash.c
+++ b/
crypto/hash.c
@@
-12,6
+12,7
@@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/seq_file.h>
#include "internal.h"
#include <linux/seq_file.h>
#include "internal.h"
@@
-46,7
+47,7
@@
static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key,
}
static int hash_setkey(struct crypto_hash *crt, const u8 *key,
}
static int hash_setkey(struct crypto_hash *crt, const u8 *key,
- unsigned int keylen)
+
unsigned int keylen)
{
struct crypto_tfm *tfm = crypto_hash_tfm(crt);
struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
{
struct crypto_tfm *tfm = crypto_hash_tfm(crt);
struct hash_alg *alg = &tfm->__crt_alg->cra_hash;