diff options
author | Markus Klotzbuecher <mk@denx.de> | 2007-05-29 16:37:57 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-05-29 16:37:57 +0200 |
commit | 51d8e813222fa3063d423220f6ff1146df58a471 (patch) | |
tree | a4951077af841bd87a90854b7fb390d12e37b851 /fs/jffs2/compr_zlib.c | |
parent | 3a619dd7bed03e8b4d22a3911f90fd12af5376c2 (diff) | |
parent | 19bf91f9628f80a55d4f171df71041574882b3d6 (diff) | |
download | u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.zip u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.gz u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.bz2 |
Merge git://www.denx.de/git/u-boot into 2007_05_15-testing
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 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)); } |