Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux...

[linux-drm-fsl-dcu.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 75485e163ca3bc8e807c10f7fdf2c761a7df377f..991c98bc4a3f51e9e7f377274084bec909483ea9 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -51,13 +51,6 @@ config PERCPU_RWSEM
 config ARCH_USE_CMPXCHG_LOCKREF
        bool
 
-config CMPXCHG_LOCKREF
-       def_bool y if ARCH_USE_CMPXCHG_LOCKREF
-       depends on SMP
-       depends on !GENERIC_LOCKBREAK
-       depends on !DEBUG_SPINLOCK
-       depends on !DEBUG_LOCK_ALLOC
-
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -329,6 +322,20 @@ config TEXTSEARCH_FSM
 config BTREE
        boolean
 
+config ASSOCIATIVE_ARRAY
+       bool
+       help
+         Generic associative array.  Can be searched and iterated over whilst
+         it is being modified.  It is also reasonably quick to search and
+         modify.  The algorithms are non-recursive, and the trees are highly
+         capacious.
+
+         See:
+
+               Documentation/assoc_array.txt
+
+         for more information.
+
 config HAS_IOMEM
        boolean
        depends on !NO_IOMEM