aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 18:34:14 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-28 18:34:14 -0400
commit38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch)
treea83d5e4e86edf6cb2de22db6f2ff2274753a2bab /lib/Kconfig
parentf2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
Merge branch 'linus' into core/printk
Diffstat (limited to 'lib/Kconfig')
-rw-r--r--lib/Kconfig26
1 files changed, 20 insertions, 6 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 97d62cf091a7..8ade0a7a91e0 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#
107config DECOMPRESS_GZIP
108 select ZLIB_INFLATE
109 tristate
110
111config DECOMPRESS_BZIP2
112 tristate
113
114config DECOMPRESS_LZMA
115 tristate
116
117#
104# Generic allocator support is selected if needed 118# Generic allocator support is selected if needed
105# 119#
106config GENERIC_ALLOCATOR 120config GENERIC_ALLOCATOR
@@ -139,12 +153,6 @@ config TEXTSEARCH_BM
139config TEXTSEARCH_FSM 153config TEXTSEARCH_FSM
140 tristate 154 tristate
141 155
142#
143# plist support is select#ed if needed
144#
145config PLIST
146 boolean
147
148config HAS_IOMEM 156config HAS_IOMEM
149 boolean 157 boolean
150 depends on !NO_IOMEM 158 depends on !NO_IOMEM
@@ -177,4 +185,10 @@ config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
177 bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS 185 bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
178 depends on EXPERIMENTAL && BROKEN 186 depends on EXPERIMENTAL && BROKEN
179 187
188#
189# Netlink attribute parsing support is select'ed if needed
190#
191config NLATTR
192 bool
193
180endmenu 194endmenu