summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-13 23:32:17 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-13 23:32:17 +0000
commit517cb32d6b50cbbf573a47f2113ed06921e1319c (patch)
tree48f6c22d06e4f60d6cd3361991a9a1ab8688423e
parent09d5e16337250d415a3f981597b5f141f9634b3a (diff)
Add a commented out option NSIP with explanation
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index f6c585cce1c..0a3a8cc2b96 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.11 1996/09/20 06:44:45 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.12 1997/01/13 23:32:16 niklas Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -53,6 +53,7 @@ option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP
#option NS # XNS
+#option NSIP # XNS tunneling over IP
#option IPX # IPX+SPX
#option ISO,TPIP # OSI
#option EON # OSI tunneling over IP