diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/sched/Kconfig | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/sched/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 778b1e5a4b50..13eeee582886 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -434,7 +434,6 @@ config NET_EMATCH_TEXT | |||
| 434 | 434 | ||
| 435 | config NET_CLS_ACT | 435 | config NET_CLS_ACT |
| 436 | bool "Actions" | 436 | bool "Actions" |
| 437 | depends on EXPERIMENTAL | ||
| 438 | select NET_ESTIMATOR | 437 | select NET_ESTIMATOR |
| 439 | ---help--- | 438 | ---help--- |
| 440 | Say Y here if you want to use traffic control actions. Actions | 439 | Say Y here if you want to use traffic control actions. Actions |