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 rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
crypto
/
crypto_null.c
diff --git
a/crypto/crypto_null.c
b/crypto/crypto_null.c
index
a0d956b
..
24dbb5d
100644
(file)
--- a/
crypto/crypto_null.c
+++ b/
crypto/crypto_null.c
@@
-48,7
+48,7
@@
static void null_final(struct crypto_tfm *tfm, u8 *out)
{ }
static int null_setkey(struct crypto_tfm *tfm, const u8 *key,
- unsigned int keylen
, u32 *flags
)
+ unsigned int keylen)
{ return 0; }
static void null_crypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)