mmc: omap: don't set wrong voltage select for mmc2

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

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index cf67967..f431cc4 100644 (file)
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -23,15 +23,10 @@
 #include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
-#include <zlib.h>
-
-#if defined(CONFIG_CMD_CRAMFS)
+#include <u-boot/zlib.h>
 
 static z_stream stream;
 
-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)
 {
@@ -61,8 +56,8 @@ int cramfs_uncompress_init (void)
 {
        int err;
 
-       stream.zalloc = zalloc;
-       stream.zfree = zfree;
+       stream.zalloc = gzalloc;
+       stream.zfree = gzfree;
        stream.next_in = 0;
        stream.avail_in = 0;
 
@@ -86,5 +81,3 @@ int cramfs_uncompress_exit (void)
        inflateEnd (&stream);
        return 0;
 }
-
-#endif /* CFG_FS_CRAMFS */