Merge branch 'async' of macbook:git/btrfs-unstable

[pandora-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 1cc756c..fa9bf2c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -120,6 +120,10 @@ config DECOMPRESS_BZIP2
 config DECOMPRESS_LZMA
        tristate
 
+config DECOMPRESS_LZO
+       select LZO_DECOMPRESS
+       tristate
+
 #
 # Generic allocator support is selected if needed
 #
@@ -159,6 +163,9 @@ config TEXTSEARCH_BM
 config TEXTSEARCH_FSM
        tristate
 
+config BTREE
+       boolean
+
 config HAS_IOMEM
        boolean
        depends on !NO_IOMEM
@@ -177,9 +184,6 @@ config HAS_DMA
 config CHECK_SIGNATURE
        bool
 
-config HAVE_LMB
-       boolean
-
 config CPUMASK_OFFSTACK
        bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
        help
@@ -203,4 +207,7 @@ config NLATTR
 config GENERIC_ATOMIC64
        bool
 
+config LRU_CACHE
+       tristate
+
 endmenu