Merge by hand (conflicts in sd.c)

[pandora-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 16b8fa2..eeb429a 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -63,21 +63,16 @@ 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_FSM
+       tristate
 
 endmenu