diff -ur modules/cloop/0.68/compressed_loop.c modules-mercury/cloop/0.68/compressed_loop.c
--- modules/cloop/0.68/compressed_loop.c	2003-06-25 06:48:30.000000000 +0200
+++ modules-mercury/cloop/0.68/compressed_loop.c	2004-09-10 15:17:12.000000000 +0200
@@ -147,7 +147,7 @@
   void *buffer;
   void *compressed_buffer;
 
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
   /* Preallocated scratch area for zlib, saves a lot of kmalloc()s */
   void *zlib_used;
   void *zlib_scratch;
@@ -173,7 +173,7 @@
 static devfs_handle_t devfs_handle;      /*  For the directory */
 #endif
 
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
 /* Use zlib uncompress */
 extern int uncompress(char *dest, unsigned long *destLen,
                       const char *source, unsigned long sourceLen);
@@ -412,7 +412,7 @@
  /* Do decompression into real buffer. */
  buflen = ntohl(cloop_dev.head.block_size);
 
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
  /* Reset zlib usage pool */
  cloop_dev.zlib_used = cloop_dev.zlib_scratch;
 #endif
@@ -743,7 +743,7 @@
           cloop_name, largest_block);
    goto error_release_free_buffer;
   }
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
 /* largest_block / 10 + 48000 seems to be sufficient for zlib working area */
  cloop_dev.zlib_size=largest_block/10+ZLIB_NEEDS;
  cloop_dev.zlib_scratch = kmalloc(cloop_dev.zlib_size, GFP_KERNEL); 
@@ -771,7 +771,7 @@
           cloop_name,
           ntohl(cloop_dev.offsets[ntohl(cloop_dev.head.num_blocks)]),
           (unsigned long)inode->i_size);
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
    kfree(cloop_dev.zlib_scratch);
 #else
    vfree(zstream.workspace); zstream.workspace=NULL;
@@ -923,7 +923,7 @@
 #endif
  kfree(cloop_dev.buffer);
  kfree(cloop_dev.compressed_buffer);
-#ifndef CONFIG_ZLIB_INFLATE
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE)
  kfree(cloop_dev.zlib_scratch);
 #ifdef DEBUGMEM
  printk("%s: Maximum zlib_scratch usage was %lu bytes.\n",
diff -ur modules/cloop/1.02/compressed_loop.c modules-mercury/cloop/1.02/compressed_loop.c
--- modules/cloop/1.02/compressed_loop.c	2004-01-29 12:42:27.000000000 +0100
+++ modules-mercury/cloop/1.02/compressed_loop.c	2004-09-10 15:20:11.000000000 +0200
@@ -115,7 +115,7 @@
 static const int max_cloop = CLOOP_MAX;
 static devfs_handle_t devfs_handle;      /*  For the directory */
 
-#ifndef CONFIG_ZLIB_INFLATE /* Not compiled in?! */
+#if !(defined CONFIG_ZLIB_INFLATE || defined CONFIG_ZLIB_INFLATE_MODULE) /* Not compiled in?! */
 #ifndef STATIC
 #define STATIC static
 #endif