diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/linux/zconf.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
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 */ |