Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[~andy/linux] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 277fbfb233b90d7e2e23e5d234881d2fb5ff2db6..496d16e1fa2cb4b88a57449a8886771e0ebe31d5 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -117,6 +117,10 @@ config DECOMPRESS_BZIP2
 config DECOMPRESS_LZMA
        tristate
 
+config DECOMPRESS_LZO
+       select LZO_DECOMPRESS
+       tristate
+
 #
 # Generic allocator support is selected if needed
 #
@@ -156,6 +160,9 @@ config TEXTSEARCH_BM
 config TEXTSEARCH_FSM
        tristate
 
+config LIST_SORT
+       boolean
+
 config BTREE
        boolean
 
@@ -203,4 +210,7 @@ config NLATTR
 config GENERIC_ATOMIC64
        bool
 
+config LRU_CACHE
+       tristate
+
 endmenu