diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-17 00:06:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-17 00:06:11 +0200 |
| commit | 3a71b5ca775fc9cf506c12d91925019591446c7c (patch) | |
| tree | 0eb875a5ed89145e1d73ce411b8e2705a53132bd /fs/jffs2/compr_zlib.c | |
| parent | 3162eb836903c8b247fdc7470dd39bfa6996f495 (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
Merge with /home/git/u-boot
Diffstat (limited to 'fs/jffs2/compr_zlib.c')
| -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 1b35585ee..d88d0f8f3 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)); } |