Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / cramfs / uncompress.c

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 5034365b06a862ac84470d560fc1684253d598ea..fc3ccb74626ffb3a581da4049c703242352dedfa 100644 (file)
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/vmalloc.h>
 #include <linux/zlib.h>
+#include <linux/cramfs_fs.h>
 
 static z_stream stream;
 static int initialized;
@@ -67,11 +68,10 @@ int cramfs_uncompress_init(void)
        return 0;
 }
 
-int cramfs_uncompress_exit(void)
+void cramfs_uncompress_exit(void)
 {
        if (!--initialized) {
                zlib_inflateEnd(&stream);
                vfree(stream.workspace);
        }
-       return 0;
 }