summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-08-25 16:23:11 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 16:11:11 -0700
commit29cb9f9c5502f6218cd3ea574efe46a5e55522d2 (patch)
treee3e16f62e7d203093e5d582db32ea357e3e70a58
parent8082e4ed0a61da347f1c7f210493c4e9e55c8cd0 (diff)
downloadop-kernel-dev-29cb9f9c5502f6218cd3ea574efe46a5e55522d2.zip
op-kernel-dev-29cb9f9c5502f6218cd3ea574efe46a5e55522d2.tar.gz
[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>
-rw-r--r--lib/Kconfig9
-rw-r--r--net/ipv4/netfilter/Kconfig1
-rw-r--r--net/sched/Kconfig1
3 files changed, 3 insertions, 8 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index b62f685..e43197e 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 f2bea6e..c4213f3 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 59d3e71..45d3bc0 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
OpenPOWER on IntegriCloud