diff --git a/[refs] b/[refs] index 9726eb52655c..7b7d27bb4c72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e8ba85417366afd2361e315c6ba5949d3eff56f +refs/heads/master: 68ce9c0e3411b430b9800015e318af9f96933aa0 diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig index 4f7ef0db302b..929218a47620 100644 --- a/trunk/net/sched/Kconfig +++ b/trunk/net/sched/Kconfig @@ -335,9 +335,6 @@ config NET_CLS_CGROUP Say Y here if you want to classify packets based on the control cgroup of their process. - To compile this code as a module, choose M here: the - module will be called cls_cgroup. - config NET_EMATCH bool "Extended Matches" select NET_CLS