BUG_ON conversion for drivers/media/video/pwc/pwc-if.c

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

diff --git a/lib/Kconfig b/lib/Kconfig
index b62f685..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
 #
@@ -73,16 +86,15 @@ config TEXTSEARCH_KMP
        tristate
 
 config TEXTSEARCH_BM
-        depends on TEXTSEARCH
-        tristate "Boyer-Moore"
-        help
-          Say Y here if you want to be able to search text using the
-          Boyer-Moore textsearch algorithm.
-
-          To compile this code as a module, choose M here: the
-          module will be called ts_bm.
+       tristate
 
 config TEXTSEARCH_FSM
        tristate
 
+#
+# plist support is select#ed if needed
+#
+config PLIST
+       boolean
+
 endmenu