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/zconf.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/zconf.h')
| -rw-r--r-- | include/linux/zconf.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/zconf.h b/include/linux/zconf.h index f1cfd66b9554..0beb75e38caa 100644 --- a/include/linux/zconf.h +++ b/include/linux/zconf.h | |||
| @@ -35,6 +35,18 @@ | |||
| 35 | # define MAX_WBITS 15 /* 32K LZ77 window */ | 35 | # define MAX_WBITS 15 /* 32K LZ77 window */ |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | /* default windowBits for decompression. MAX_WBITS is for compression only */ | ||
| 39 | #ifndef DEF_WBITS | ||
| 40 | # define DEF_WBITS MAX_WBITS | ||
| 41 | #endif | ||
| 42 | |||
| 43 | /* default memLevel */ | ||
| 44 | #if MAX_MEM_LEVEL >= 8 | ||
| 45 | # define DEF_MEM_LEVEL 8 | ||
| 46 | #else | ||
| 47 | # define DEF_MEM_LEVEL MAX_MEM_LEVEL | ||
| 48 | #endif | ||
| 49 | |||
| 38 | /* Type declarations */ | 50 | /* Type declarations */ |
| 39 | 51 | ||
| 40 | typedef unsigned char Byte; /* 8 bits */ | 52 | typedef unsigned char Byte; /* 8 bits */ |