Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / jffs2 / compr_zlib.c

diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 97fc45de6f81eace3538ae22e9e8239834d9856f..fd05a0b9431df3e2bb37ed3b4bed29a131c37ffd 100644 (file)
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -68,8 +68,7 @@ static void free_workspaces(void)
 
 static int jffs2_zlib_compress(unsigned char *data_in,
                               unsigned char *cpage_out,
-                              uint32_t *sourcelen, uint32_t *dstlen,
-                              void *model)
+                              uint32_t *sourcelen, uint32_t *dstlen)
 {
        int ret;
 
@@ -136,8 +135,7 @@ static int jffs2_zlib_compress(unsigned char *data_in,
 
 static int jffs2_zlib_decompress(unsigned char *data_in,
                                 unsigned char *cpage_out,
-                                uint32_t srclen, uint32_t destlen,
-                                void *model)
+                                uint32_t srclen, uint32_t destlen)
 {
        int ret;
        int wbits = MAX_WBITS;