[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>

diff --git a/lib/Kconfig b/lib/Kconfig
index b62f685f797fd7e7e4dc578eb0896f0e500685da..e43197efeb9c559a459cf199a9908a876eb3a976 100644 (file)
--- 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 f2bea6ecb2263fb04fc72835887acbf4164b9ebe..c4213f3de505ceb986dfcb392041906b9ef7d61a 100644 (file)
--- 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 59d3e71f8b85296c820a0099010d50341d0135fb..45d3bc0812c8b270ea95e7a6c21799d6ec42273b 100644 (file)
--- 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