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

[karo-tx-linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 334f7722a999232aa46b706d8cda61b57c854708..a5ce0c7f6c302058da57fe19bda51b9286cdd883 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -396,6 +396,39 @@ config CPU_RMAP
 config DQL
        bool
 
+config GLOB
+       bool
+#      This actually supports modular compilation, but the module overhead
+#      is ridiculous for the amount of code involved.  Until an out-of-tree
+#      driver asks for it, we'll just link it directly it into the kernel
+#      when required.  Since we're ignoring out-of-tree users, there's also
+#      no need bother prompting for a manual decision:
+#      prompt "glob_match() function"
+       help
+         This option provides a glob_match function for performing
+         simple text pattern matching.  It originated in the ATA code
+         to blacklist particular drive models, but other device drivers
+         may need similar functionality.
+
+         All drivers in the Linux kernel tree that require this function
+         should automatically select this option.  Say N unless you
+         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
 #
@@ -451,7 +484,8 @@ config MPILIB
 
 config SIGNATURE
        tristate
-       depends on KEYS && CRYPTO
+       depends on KEYS
+       select CRYPTO
        select CRYPTO_SHA1
        select MPILIB
        help
@@ -474,4 +508,11 @@ config UCS2_STRING
 
 source "lib/fonts/Kconfig"
 
+#
+# sg chaining option
+#
+
+config ARCH_HAS_SG_CHAIN
+       def_bool n
+
 endmenu