Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 3cca122..260a80e 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -362,6 +362,9 @@ config INTERVAL_TREE
 
          for more information.
 
+config RADIX_TREE_MULTIORDER
+       bool
+
 config ASSOCIATIVE_ARRAY
        bool
        help
@@ -454,9 +457,6 @@ config NLATTR
 config GENERIC_ATOMIC64
        bool
 
-config ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-       def_bool y if GENERIC_ATOMIC64
-
 config LRU_CACHE
        tristate
 
@@ -523,6 +523,13 @@ config SG_SPLIT
         a scatterlist. This should be selected by a driver or an API which
         whishes to split a scatterlist amongst multiple DMA channels.
 
+config SG_POOL
+       def_bool n
+       help
+        Provides a helper to allocate chained scatterlists. This should be
+        selected by a driver or an API which whishes to allocate chained
+        scatterlist.
+
 #
 # sg chaining option
 #
@@ -540,4 +547,7 @@ config STACKDEPOT
        bool
        select STACKTRACE
 
+config SBITMAP
+       bool
+
 endmenu