diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:33:23 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:33:23 +0100 |
| commit | fdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch) | |
| tree | afb703e6e43ff91e6f456f12fbb43fb598373fd5 /fs | |
| parent | 1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.tar.gz u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.tar.xz u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/compr_zlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c index 1b35585eee..d88d0f8f36 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)); } |