Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

[u-boot] / fs / cramfs / uncompress.c

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index a9c0b7d46ebd0514d7402a6ed3829eb05e94ec31..cf67967904befae8405bb14bbd9de10c29c05f89 100644 (file)
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -29,24 +29,8 @@
 
 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)