2.6.25-rc7

 net

 sched

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 9c15c48..82adfe6 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -198,6 +198,7 @@ config NET_SCH_NETEM
 
 config NET_SCH_INGRESS
    tristate "Ingress Qdisc"
+   depends on NET_CLS_ACT
    ---help---
      Say Y here if you want to use classifiers for incoming packets.
      If unsure, say Y.
@@ -306,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
@@ -445,7 +457,6 @@ config NET_ACT_IPT
 config NET_ACT_NAT
         tristate "Stateless NAT"
         depends on NET_CLS_ACT
-        select NETFILTER
         ---help---
      Say Y here to do stateless NAT on IPv4 packets.  You should use
      netfilter for NAT unless you know what you are doing.
@@ -476,15 +487,6 @@ config NET_ACT_SIMP
      To compile this code as a module, choose M here: the
      module will be called simple.
 
-config NET_CLS_POLICE
-   bool "Traffic Policing (obsolete)"
-   select NET_CLS_ACT
-   select NET_ACT_POLICE
-   ---help---
-     Say Y here if you want to do traffic policing, i.e. strict
-     bandwidth limiting. This option is obsolete and just selects
-     the option replacing it. It will be removed in the future.
-
 config NET_CLS_IND
    bool "Incoming device classification"
    depends on NET_CLS_U32 || NET_CLS_FW