diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /lib/Kconfig | |
| parent | 9de36825b321fe9fe9cf73260554251af579f4ca (diff) | |
| parent | 78ff7fae04554b49d29226ed12536268c2500d1f (diff) | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 97d62cf091a7..206f36a9efb4 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -101,6 +101,20 @@ config LZO_DECOMPRESS | |||
| 101 | tristate | 101 | tristate |
| 102 | 102 | ||
| 103 | # | 103 | # |
| 104 | # These all provide a common interface (hence the apparent duplication with | ||
| 105 | # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) | ||
| 106 | # | ||
| 107 | config DECOMPRESS_GZIP | ||
| 108 | select ZLIB_INFLATE | ||
| 109 | tristate | ||
| 110 | |||
| 111 | config DECOMPRESS_BZIP2 | ||
| 112 | tristate | ||
| 113 | |||
| 114 | config DECOMPRESS_LZMA | ||
| 115 | tristate | ||
| 116 | |||
| 117 | # | ||
| 104 | # Generic allocator support is selected if needed | 118 | # Generic allocator support is selected if needed |
| 105 | # | 119 | # |
| 106 | config GENERIC_ALLOCATOR | 120 | config GENERIC_ALLOCATOR |