From 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 25 Aug 2005 16:23:11 -0700
Subject: [PATCH] [LIB]: Make TEXTSEARCH_BM plain tristate like the others

And select it when the relevant modules are enabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 lib/Kconfig                | 9 +--------
 net/ipv4/netfilter/Kconfig | 1 +
 net/sched/Kconfig          | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index b62f685f797f..e43197efeb9c 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -73,14 +73,7 @@ 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
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index f2bea6ecb226..c4213f3de505 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -415,6 +415,7 @@ config IP_NF_MATCH_STRING
 	depends on IP_NF_IPTABLES 
 	select TEXTSEARCH
 	select TEXTSEARCH_KMP
+	select TEXTSEARCH_BM
 	select TEXTSEARCH_FSM
 	help
 	  This option adds a `string' match, which allows you to look for
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 59d3e71f8b85..45d3bc0812c8 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -491,6 +491,7 @@ config NET_EMATCH_TEXT
 	depends on NET_EMATCH
 	select TEXTSEARCH
 	select TEXTSEARCH_KMP
+	select TEXTSEARCH_BM
 	select TEXTSEARCH_FSM
 	---help---
 	  Say Y here if you want to be ablt to classify packets based on