diff --git a/[refs] b/[refs]
index d32caba5bdf6..36dd6607e442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3e112bcc19abd8e9657dca34a87316786e096f3
+refs/heads/master: f7704347a74fceaf79c89f8b8dbdd0111013e4d6
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 455833a9e31a..eeb429a52152 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/lib/Kconfig
@@ -63,32 +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.
-
-	  To compile this code as a module, choose M here: the
-	  module will be called ts_kmp.
+	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
diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig
index 447b89e556b1..7bac249258e3 100644
--- a/trunk/net/sched/Kconfig
+++ b/trunk/net/sched/Kconfig
@@ -453,10 +453,11 @@ config NET_EMATCH_TEXT
 	tristate "Textsearch"
 	depends on NET_EMATCH
 	select TEXTSEARCH
+	select TEXTSEARCH_KMP
+	select TEXTSEARCH_FSM
 	---help---
 	  Say Y here if you want to be ablt to classify packets based on
-	  textsearch comparisons. Please select the appropriate textsearch
-	  algorithms in the Library section.
+	  textsearch comparisons.
 
 	  To compile this code as a module, choose M here: the
 	  module will be called em_text.