summaryrefslogtreecommitdiffstats
path: root/net/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /net/Config.in
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'net/Config.in')
-rw-r--r--net/Config.in20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/Config.in b/net/Config.in
index 4d4f6c373..96b8ee502 100644
--- a/net/Config.in
+++ b/net/Config.in
@@ -77,15 +77,15 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate 'WAN router' CONFIG_WAN_ROUTER
bool 'Fast switching (read help!)' CONFIG_NET_FASTROUTE
bool 'Forwarding between high speed interfaces' CONFIG_NET_HW_FLOWCONTROL
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- mainmenu_option next_comment
- comment 'QoS and/or fair queueing'
- bool 'QoS and/or fair queueing (EXPERIMENTAL)' CONFIG_NET_SCHED
- if [ "$CONFIG_NET_SCHED" = "y" ]; then
- source net/sched/Config.in
- fi
-# bool 'Network code profiler' CONFIG_NET_PROFILE
- endmenu
- fi
fi
+
+mainmenu_option next_comment
+comment 'QoS and/or fair queueing'
+bool 'QoS and/or fair queueing (EXPERIMENTAL)' CONFIG_NET_SCHED
+if [ "$CONFIG_NET_SCHED" = "y" ]; then
+ source net/sched/Config.in
+fi
+#bool 'Network code profiler' CONFIG_NET_PROFILE
+endmenu
+
endmenu