diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/linux/zutil.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
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 |