merge linus head to drm-mm branch

[safe/jmp/linux-2.6] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 5bc2d52..3de9335 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -12,6 +12,14 @@ config CRC_CCITT
          the kernel tree does. Such modules that use library CRC-CCITT
          functions require M here.
 
+config CRC16
+       tristate "CRC16 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC16 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC16
+         functions require M here.
+
 config CRC32
        tristate "CRC32 functions"
        default y
@@ -63,11 +71,19 @@ config REED_SOLOMON_ENC16
 config REED_SOLOMON_DEC16
        boolean
 
+#
+# Textsearch support is select'ed if needed
+#
 config TEXTSEARCH
-       boolean "Textsearch infrastructure"
-       default y
-       help
-         Say Y here if you want to provide a textsearch infrastructure
-         to other subsystems.
+       boolean
+
+config TEXTSEARCH_KMP
+       tristate
+
+config TEXTSEARCH_BM
+       tristate
+
+config TEXTSEARCH_FSM
+       tristate
 
 endmenu