Merge commit 'v2.6.36' into kbuild/misc

[net-next-2.6.git] / crypto / pcompress.c

diff --git a/crypto/pcompress.c b/crypto/pcompress.c
index bcadc03726b7eb2d12ac71b251da31e4e38651bf..f7c4a7d7412ee69600ddd018a3099e9e8bb51e69 100644 (file)
--- a/crypto/pcompress.c
+++ b/crypto/pcompress.c
@@ -36,14 +36,12 @@ static int crypto_pcomp_init(struct crypto_tfm *tfm, u32 type, u32 mask)
        return 0;
 }
 
-static unsigned int crypto_pcomp_extsize(struct crypto_alg *alg,
-                                        const struct crypto_type *frontend)
+static unsigned int crypto_pcomp_extsize(struct crypto_alg *alg)
 {
        return alg->cra_ctxsize;
 }
 
-static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm,
-                                const struct crypto_type *frontend)
+static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm)
 {
        return 0;
 }