[PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found

[pandora-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 455833a..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,32 +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
-       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.
-
-         To compile this code as a module, choose M here: the
-         module will be called ts_fsm.
+       tristate
 
 endmenu