Merge tag 'sound-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 41bfeec72e40386b3a22fc60b8d4a3bc3e4333f7..a5ce0c7f6c302058da57fe19bda51b9286cdd883 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -415,6 +415,20 @@ config GLOB
          are compiling an out-of tree driver which tells you that it
          depends on this.
 
+config GLOB_SELFTEST
+       bool "glob self-test on init"
+       default n
+       depends on GLOB
+       help
+         This option enables a simple self-test of the glob_match
+         function on startup.  It is primarily useful for people
+         working on the code to ensure they haven't introduced any
+         regressions.
+
+         It only adds a little bit of code and slows kernel boot (or
+         module load) by a small amount, so you're welcome to play with
+         it, but you probably don't need it.
+
 #
 # Netlink attribute parsing support is select'ed if needed
 #
@@ -494,4 +508,11 @@ config UCS2_STRING
 
 source "lib/fonts/Kconfig"
 
+#
+# sg chaining option
+#
+
+config ARCH_HAS_SG_CHAIN
+       def_bool n
+
 endmenu