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

[firefly-linux-kernel-4.4.55.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index f6aa03dc15760745ec45475ebb17b058d63b90c1..8a49ff9d15027af8e0c60b40c56f56e4d54f8125 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -457,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
 
@@ -518,6 +508,13 @@ config UCS2_STRING
 
 source "lib/fonts/Kconfig"
 
+config SG_SPLIT
+       def_bool n
+       help
+        Provides a heler to split scatterlists into chunks, each chunk being a
+        scatterlist. This should be selected by a driver or an API which
+        whishes to split a scatterlist amongst multiple DMA channel.
+
 #
 # sg chaining option
 #