summaryrefslogtreecommitdiff
path: root/fs/jffs2/compr_zlib.c
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-05-18 14:34:19 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-05-18 14:34:19 +0100
commit879027daa838d245bf433ca2bb446bedace724f0 (patch)
tree663792e944d667843d77f81dd3d5ab56ffa7f098 /fs/jffs2/compr_zlib.c
parent93ef45c9ddfdd9fc17c4e74bd8e2f2456580eb72 (diff)
parent70124c2602ae2d4c5d3dba05b482d91548242de8 (diff)
downloadu-boot-imx-879027daa838d245bf433ca2bb446bedace724f0.zip
u-boot-imx-879027daa838d245bf433ca2bb446bedace724f0.tar.gz
u-boot-imx-879027daa838d245bf433ca2bb446bedace724f0.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'fs/jffs2/compr_zlib.c')
-rw-r--r--fs/jffs2/compr_zlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 1b35585..d88d0f8 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -45,7 +45,7 @@
long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out,
__u32 srclen, __u32 destlen)
{
- return (decompress_block(cpage_out, data_in + 2, ldr_memcpy));
+ return (decompress_block(cpage_out, data_in + 2, (void *) ldr_memcpy));
}