summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2010-01-11 10:29:17 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2010-01-11 10:29:17 +0000
commitf11847fbe3e5e7ba95c47372ec186fd296253da8 (patch)
treeebb8b02d9fd85d88f2650de07c7acf4ca695219a /sys
parent97fb04c553b127bbccc660bfa3b7ca5392356617 (diff)
Add PIPEX option, disabled by default for now.
ok deraadt yasuoka
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 5f6103acf33..b84220b545d 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.150 2009/11/09 03:16:07 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.151 2010/01/11 10:29:16 mcbride Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -65,6 +65,7 @@ option IPSEC # IPsec
#option NETATALK # AppleTalk
option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
+#option PIPEX # Pppac IP EXtension, for npppd
option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast