diff --git a/[refs] b/[refs] index 16a663ff2517..613ba46c0dcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbb042f9e1292434e3cacb90e67d8d381aeac5a9 +refs/heads/master: afb5bb57440f7c419b1214628d32c92293f1cfd4 diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig index 778b1e5a4b50..13eeee582886 100644 --- a/trunk/net/sched/Kconfig +++ b/trunk/net/sched/Kconfig @@ -434,7 +434,6 @@ config NET_EMATCH_TEXT config NET_CLS_ACT bool "Actions" - depends on EXPERIMENTAL select NET_ESTIMATOR ---help--- Say Y here if you want to use traffic control actions. Actions