summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorJean-Jacques Bernard-Gundol <jjbg@cvs.openbsd.org>2001-08-08 15:15:29 +0000
committerJean-Jacques Bernard-Gundol <jjbg@cvs.openbsd.org>2001-08-08 15:15:29 +0000
commite23b9511bb9df2d0c682fcf4268b52124fc25add (patch)
tree02d6825390f4a473b3f72bff8654562bea469dec /sys/conf/GENERIC
parentfc091432aab3248d65179b0903fbc05006cbae2e (diff)
IPCOMP removal. deraadt@ ok.
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 0511c71f46d..f6e25056ce8 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.82 2001/07/06 17:40:35 angelos Exp $
+# $OpenBSD: GENERIC,v 1.83 2001/08/08 15:15:28 jjbg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -75,7 +75,6 @@ option IPSEC # IPsec
option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
#option MROUTING # Multicast router
-#option IPCOMP # IPComp, requires IPsec
pseudo-device pf 1 # packet filter
pseudo-device pflog 1 # pf log if