Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index d79909dc01ec8365ab1cf29b1c7ce6dd4c78b0ab..260a80e313b9022a711f77a8531feb5f864fa91c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -457,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
 
@@ -550,4 +547,7 @@ config STACKDEPOT
        bool
        select STACKTRACE
 
+config SBITMAP
+       bool
+
 endmenu