diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /lib/Kconfig | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 03c2c24b9083..daa481824d9c 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 |