summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-07-15 12:11:37 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-07-15 12:11:37 +0000
commit7a7b3de57ceac94188822edc274be66594eebddf (patch)
tree3c431f8124867139f39b65b245eeb4fba89d00e1 /sys/conf
parent1ff8d9bcf7a2f40648df7f449c8178d507bcd212 (diff)
remove commented-out netiso stuff
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 57f2ea50aad..0ffe1492283 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.107 2004/05/28 08:16:23 grange Exp $
+# $OpenBSD: GENERIC,v 1.108 2004/07/15 12:11:36 henning Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -70,8 +70,6 @@ option IPSEC # IPsec
#option NSIP # XNS tunneling over IP
#option IPX # IPX+SPX
#option IPXIP # IPX tunneling over IP
-#option ISO,TPIP # OSI
-#option EON # OSI tunneling over IP
#option NETATALK # AppleTalk
#option CCITT,LLC,HDLC # X.25
option PPP_BSDCOMP # PPP BSD compression