summaryrefslogtreecommitdiffstats
path: root/net/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /net/Config.in
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'net/Config.in')
-rw-r--r--net/Config.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/Config.in b/net/Config.in
index b64570308..43e0e1705 100644
--- a/net/Config.in
+++ b/net/Config.in
@@ -18,8 +18,8 @@ if [ "$CONFIG_INET" = "y" ]; then
source net/ipv4/Config.in
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
# Sorry, but IPv6 as module is still invalid.
-# tristate 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6
- bool 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6
+ tristate 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6
+# bool 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6
if [ "$CONFIG_IPV6" != "n" ]; then
source net/ipv6/Config.in
fi