diff --git a/[refs] b/[refs] index a03268602ed0..aff4c7a76987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f12ca5f97b7f99288aff1dc32a91f21c3230fefe +refs/heads/master: 13a0a096e58a1149a8cffbd7722b820044e3801e diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig index 554248e0fc4c..87af7c913d81 100644 --- a/trunk/net/sched/Kconfig +++ b/trunk/net/sched/Kconfig @@ -476,15 +476,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