Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

[linux-2.6-omap-h63xx.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 54aaf4feaf6c01e05b436866af7522301890eaa2..2a9c69f3448216e8ce3f6a0f5488a947dfa55060 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -97,6 +97,20 @@ config LZO_COMPRESS
 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
 #