projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /repos/git/net-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
crypto
/
compress.c
diff --git
a/crypto/compress.c
b/crypto/compress.c
index eca182aa33808dd1e54964ff838a91287d2081ea..1ee357085d3a40bfdd8e3013e7fc7b501eb32948 100644
(file)
--- a/
crypto/compress.c
+++ b/
crypto/compress.c
@@
-14,7
+14,6
@@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/errno.h>
-#include <asm/scatterlist.h>
#include <linux/string.h>
#include "internal.h"
#include <linux/string.h>
#include "internal.h"
@@
-34,11
+33,6
@@
static int crypto_decompress(struct crypto_tfm *tfm,
dlen);
}
dlen);
}
-int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags)
-{
- return flags ? -EINVAL : 0;
-}
-
int crypto_init_compress_ops(struct crypto_tfm *tfm)
{
struct compress_tfm *ops = &tfm->crt_compress;
int crypto_init_compress_ops(struct crypto_tfm *tfm)
{
struct compress_tfm *ops = &tfm->crt_compress;