Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index eeb4522..734ce95 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
@@ -30,6 +38,11 @@ config LIBCRC32C
          require M here.  See Castagnoli93.
          Module will be libcrc32c.
 
+config AUDIT_GENERIC
+       bool
+       depends on AUDIT && !AUDIT_ARCH
+       default y
+
 #
 # compression support is select'ed if needed
 #
@@ -39,6 +52,12 @@ config ZLIB_INFLATE
 config ZLIB_DEFLATE
        tristate
 
+#
+# Generic allocator support is selected if needed
+#
+config GENERIC_ALLOCATOR
+       boolean
+
 #
 # reed solomon support is select'ed if needed
 #
@@ -57,5 +76,25 @@ config REED_SOLOMON_ENC16
 config REED_SOLOMON_DEC16
        boolean
 
-endmenu
+#
+# Textsearch support is select'ed if needed
+#
+config TEXTSEARCH
+       boolean
+
+config TEXTSEARCH_KMP
+       tristate
+
+config TEXTSEARCH_BM
+       tristate
+
+config TEXTSEARCH_FSM
+       tristate
+
+#
+# plist support is select#ed if needed
+#
+config PLIST
+       boolean
 
+endmenu