diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /lib/Kconfig | |
| parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | kernel_goldelico_gta04-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.zip kernel_goldelico_gta04-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.gz kernel_goldelico_gta04-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.bz2 | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 97d62cf..8ade0a7 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -101,6 +101,20 @@ config LZO_DECOMPRESS tristate # +# These all provide a common interface (hence the apparent duplication with +# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) +# +config DECOMPRESS_GZIP + select ZLIB_INFLATE + tristate + +config DECOMPRESS_BZIP2 + tristate + +config DECOMPRESS_LZMA + tristate + +# # Generic allocator support is selected if needed # config GENERIC_ALLOCATOR @@ -139,12 +153,6 @@ config TEXTSEARCH_BM config TEXTSEARCH_FSM tristate -# -# plist support is select#ed if needed -# -config PLIST - boolean - config HAS_IOMEM boolean depends on !NO_IOMEM @@ -177,4 +185,10 @@ config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS depends on EXPERIMENTAL && BROKEN +# +# Netlink attribute parsing support is select'ed if needed +# +config NLATTR + bool + endmenu |