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

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

diff --git a/lib/Kconfig b/lib/Kconfig
index 455833a..85cf7ea 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -4,6 +4,15 @@
 
 menu "Library routines"
 
+config BITREVERSE
+       tristate
+
+config GENERIC_FIND_FIRST_BIT
+       bool
+
+config GENERIC_FIND_NEXT_BIT
+       bool
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -12,15 +21,47 @@ 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 CRC_T10DIF
+       tristate "CRC calculation for the T10 Data Integrity Field"
+       help
+         This option is only needed if a module that's not in the
+         kernel tree needs to calculate CRC checks for use with the
+         SCSI data integrity subsystem.
+
+config CRC_ITU_T
+       tristate "CRC ITU-T V.41 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC ITU-T V.41 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC ITU-T V.41
+         functions require M here.
+
 config CRC32
        tristate "CRC32 functions"
        default y
+       select BITREVERSE
        help
          This option is provided for the case where no in-kernel-tree
          modules require CRC32 functions, but a module built outside the
          kernel tree does. Such modules that use library CRC32 functions
          require M here.
 
+config CRC7
+       tristate "CRC7 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC7 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC7
+         functions require M here.
+
 config LIBCRC32C
        tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
        help
@@ -30,6 +71,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 +85,12 @@ config ZLIB_INFLATE
 config ZLIB_DEFLATE
        tristate
 
+config LZO_COMPRESS
+       tristate
+
+config LZO_DECOMPRESS
+       tristate
+
 #
 # Generic allocator support is selected if needed
 #
@@ -63,32 +115,46 @@ 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
-       depends on TEXTSEARCH
-       tristate "Knuth-Morris-Pratt"
-       help
-         Say Y here if you want to be able to search text using the
-         Knuth-Morris-Pratt textsearch algorithm.
+       tristate
 
-         To compile this code as a module, choose M here: the
-         module will be called ts_kmp.
+config TEXTSEARCH_BM
+       tristate
 
 config TEXTSEARCH_FSM
-       depends on TEXTSEARCH
-       tristate "Finite state machine"
-       help
-         Say Y here if you want to be able to search text using a
-         naive finite state machine approach implementing a subset
-         of regular expressions.
+       tristate
+
+#
+# plist support is select#ed if needed
+#
+config PLIST
+       boolean
+
+config HAS_IOMEM
+       boolean
+       depends on !NO_IOMEM
+       default y
+
+config HAS_IOPORT
+       boolean
+       depends on HAS_IOMEM && !NO_IOPORT
+       default y
+
+config HAS_DMA
+       boolean
+       depends on !NO_DMA
+       default y
+
+config CHECK_SIGNATURE
+       bool
 
-         To compile this code as a module, choose M here: the
-         module will be called ts_fsm.
+config HAVE_LMB
+       boolean
 
 endmenu