diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/zutil.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/zutil.h')
| -rw-r--r-- | include/linux/zutil.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/zutil.h b/include/linux/zutil.h index ee0c59cf2136..6adfa9a6ffe9 100644 --- a/include/linux/zutil.h +++ b/include/linux/zutil.h | |||
| @@ -23,18 +23,6 @@ typedef unsigned long ulg; | |||
| 23 | 23 | ||
| 24 | /* common constants */ | 24 | /* common constants */ |
| 25 | 25 | ||
| 26 | #ifndef DEF_WBITS | ||
| 27 | # define DEF_WBITS MAX_WBITS | ||
| 28 | #endif | ||
| 29 | /* default windowBits for decompression. MAX_WBITS is for compression only */ | ||
| 30 | |||
| 31 | #if MAX_MEM_LEVEL >= 8 | ||
| 32 | # define DEF_MEM_LEVEL 8 | ||
| 33 | #else | ||
| 34 | # define DEF_MEM_LEVEL MAX_MEM_LEVEL | ||
| 35 | #endif | ||
| 36 | /* default memLevel */ | ||
| 37 | |||
| 38 | #define STORED_BLOCK 0 | 26 | #define STORED_BLOCK 0 |
| 39 | #define STATIC_TREES 1 | 27 | #define STATIC_TREES 1 |
| 40 | #define DYN_TREES 2 | 28 | #define DYN_TREES 2 |