diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 16:39:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 12:28:43 -0400 |
| commit | 6e15cf04860074ad032e88c306bea656bbdd0f22 (patch) | |
| tree | c346383bb7563e8d66b2f4a502f875b259c34870 /lib/Kconfig | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
| parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) | |
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.c
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 54aaf4feaf6c..2a9c69f34482 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -98,6 +98,20 @@ config LZO_DECOMPRESS | |||
| 98 | tristate | 98 | tristate |
| 99 | 99 | ||
| 100 | # | 100 | # |
| 101 | # These all provide a common interface (hence the apparent duplication with | ||
| 102 | # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) | ||
| 103 | # | ||
| 104 | config DECOMPRESS_GZIP | ||
| 105 | select ZLIB_INFLATE | ||
| 106 | tristate | ||
| 107 | |||
| 108 | config DECOMPRESS_BZIP2 | ||
| 109 | tristate | ||
| 110 | |||
| 111 | config DECOMPRESS_LZMA | ||
| 112 | tristate | ||
| 113 | |||
| 114 | # | ||
| 101 | # Generic allocator support is selected if needed | 115 | # Generic allocator support is selected if needed |
| 102 | # | 116 | # |
| 103 | config GENERIC_ALLOCATOR | 117 | config GENERIC_ALLOCATOR |