Auto merge with /home/aegl/GIT/ia64-test

[linux-2.6-omap-h63xx.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index b0941186f867710a4f4ca4a9fdb486aa2d9b1455..7bac249258e3a32bc91e658deaf1e335077a2b81 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -405,7 +405,7 @@ config NET_EMATCH_STACK
        ---help---
          Size of the local stack variable used while evaluating the tree of
          ematches. Limits the depth of the tree, i.e. the number of
-         encapsulated precedences. Every level requires 4 bytes of addtional
+         encapsulated precedences. Every level requires 4 bytes of additional
          stack space.
 
 config NET_EMATCH_CMP
@@ -449,6 +449,19 @@ config NET_EMATCH_META
          To compile this code as a module, choose M here: the
          module will be called em_meta.
 
+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.
+
+         To compile this code as a module, choose M here: the
+         module will be called em_text.
+
 config NET_CLS_ACT
        bool "Packet ACTION"
        depends on EXPERIMENTAL && NET_CLS && NET_QOS