Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index fa9bf2c0619919e19e90c0276a7c8738bdb7016c..0ee67e08ad3ec2486e4d2c7d11681bee406d61e3 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -106,6 +106,8 @@ config LZO_COMPRESS
 config LZO_DECOMPRESS
        tristate
 
+source "lib/xz/Kconfig"
+
 #
 # These all provide a common interface (hence the apparent duplication with
 # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
@@ -120,6 +122,10 @@ config DECOMPRESS_BZIP2
 config DECOMPRESS_LZMA
        tristate
 
+config DECOMPRESS_XZ
+       select XZ_DEC
+       tristate
+
 config DECOMPRESS_LZO
        select LZO_DECOMPRESS
        tristate
@@ -210,4 +216,7 @@ config GENERIC_ATOMIC64
 config LRU_CACHE
        tristate
 
+config AVERAGE
+       bool
+
 endmenu