summaryrefslogtreecommitdiff
path: root/fs/jffs2/compr_zlib.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-05-18 11:20:02 +0200
committerStefan Roese <sr@denx.de>2007-05-18 11:20:02 +0200
commitee96088ca59d871ec096aefce04b741d1b02cb30 (patch)
tree6a97720507c4bbd57ec5f6a8faf09e0971e5449d /fs/jffs2/compr_zlib.c
parentada4697d0230d6da552867777f98a67ec3ba2579 (diff)
parent70124c2602ae2d4c5d3dba05b482d91548242de8 (diff)
downloadu-boot-imx-ee96088ca59d871ec096aefce04b741d1b02cb30.zip
u-boot-imx-ee96088ca59d871ec096aefce04b741d1b02cb30.tar.gz
u-boot-imx-ee96088ca59d871ec096aefce04b741d1b02cb30.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));
}