Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index bb1326d3839c..170d8ca901d8 100644
--- 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 BTREE
+        boolean
+
 config HAS_IOMEM
         boolean
         depends on !NO_IOMEM
@@ -200,4 +207,7 @@ config NLATTR
 config GENERIC_ATOMIC64
        bool
 
+config LRU_CACHE
+        tristate
+
 endmenu