Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[cascardo/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index dc51616..2e491ac 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -53,9 +53,6 @@ config GENERIC_IO
 config STMP_DEVICE
        bool
 
-config PERCPU_RWSEM
-       bool
-
 config ARCH_USE_CMPXCHG_LOCKREF
        bool
 
@@ -460,16 +457,6 @@ config ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 config LRU_CACHE
        tristate
 
-config AVERAGE
-       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.
-
 config CLZ_TAB
        bool
 
@@ -538,4 +525,7 @@ config ARCH_HAS_SG_CHAIN
 config ARCH_HAS_PMEM_API
        bool
 
+config ARCH_HAS_MMIO_FLUSH
+       bool
+
 endmenu