From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Mar 2001 20:33:35 +0000
Subject: Merge with Linux 2.4.2.

---
 net/Config.in | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'net/Config.in')

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
-- 
cgit v1.2.3