Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index b9fef78ed04f8a8ddc585deff8649d38c1a2c9c6..9c10e38fc609b86605549eba4ce02b1b1cb09de1 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -22,6 +22,9 @@ config GENERIC_FIND_FIRST_BIT
 config GENERIC_FIND_NEXT_BIT
        bool
 
+config GENERIC_FIND_BIT_LE
+       bool
+
 config GENERIC_FIND_LAST_BIT
        bool
        default y
@@ -240,6 +243,10 @@ config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
        bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
        depends on EXPERIMENTAL && BROKEN
 
+config CPU_RMAP
+       bool
+       depends on SMP
+
 #
 # Netlink attribute parsing support is select'ed if needed
 #
@@ -256,6 +263,13 @@ config LRU_CACHE
        tristate
 
 config AVERAGE
-       bool
+       bool "Averaging functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require averaging functions, but a module built outside
+         the kernel tree does. Such modules that use library averaging
+         functions require Y here.
+
+         If unsure, say N.
 
 endmenu