[SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention

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

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 87af7c913d815e470e55b9274206ec5e320b1f1c..82adfe6447d7db004c7108731e0ad4c7b87f8657 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -198,7 +198,7 @@ config NET_SCH_NETEM
 
 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
-       depends on NET_CLS_ACT || NETFILTER
+       depends on NET_CLS_ACT
        ---help---
          Say Y here if you want to use classifiers for incoming packets.
          If unsure, say Y.
@@ -307,6 +307,17 @@ config NET_CLS_RSVP6
          To compile this code as a module, choose M here: the
          module will be called cls_rsvp6.
 
+config NET_CLS_FLOW
+       tristate "Flow classifier"
+       select NET_CLS
+       ---help---
+         If you say Y here, you will be able to classify packets based on
+         a configurable combination of packet keys. This is mostly useful
+         in combination with SFQ.
+
+         To compile this code as a module, choose M here: the
+         module will be called cls_flow.
+
 config NET_EMATCH
        bool "Extended Matches"
        select NET_CLS