Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6-omap-h63xx.git] / include / linux / zconf.h

diff --git a/include/linux/zconf.h b/include/linux/zconf.h
index f1cfd66b9554bfe27fcfbd40559222909ff1c542..0beb75e38caa6e93411879047d7c3b1b83b9fc81 100644 (file)
--- a/include/linux/zconf.h
+++ b/include/linux/zconf.h
@@ -33,6 +33,18 @@
  */
 #ifndef MAX_WBITS
 #  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
 #endif
 
                         /* Type declarations */