X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=fs%2Fcramfs%2Funcompress.c;h=228fe68c11a14f7832ad3a8b7b91ae5c92fa7a75;hb=c8cf4fc40757fa08af835dd886d9f7dacb515683;hp=2e906eb4cfa498a2c61e1f5d39050fe6ef894628;hpb=2c4faea84f3d96d674e3c065e1f220b20c8930c0;p=u-boot

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 2e906eb4cf..228fe68c11 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -23,30 +23,12 @@
 #include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
-#include <zlib.h>
-
-#if defined(CONFIG_CMD_JFFS2)
+#include <u-boot/zlib.h>
 
 static z_stream stream;
 
-#define ZALLOC_ALIGNMENT	16
-
-static void *zalloc (void *x, unsigned items, unsigned size)
-{
-	void *p;
-
-	size *= items;
-	size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1);
-
-	p = malloc (size);
-
-	return (p);
-}
-
-static void zfree (void *x, void *addr, unsigned nb)
-{
-	free (addr);
-}
+void *zalloc(void *, unsigned, unsigned);
+void zfree(void *, void *, unsigned);
 
 /* Returns length of decompressed data. */
 int cramfs_uncompress_block (void *dst, void *src, int srclen)
@@ -102,5 +84,3 @@ int cramfs_uncompress_exit (void)
 	inflateEnd (&stream);
 	return 0;
 }
-
-#endif /* CFG_FS_CRAMFS */