summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2012-09-19 17:50:18 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2012-09-19 17:50:18 +0000
commitdc0d522f7aed69a5d09f5804a3bfe980fe6b418a (patch)
treeab959eba7ad241cbab5597a63da71a910b9f9b21 /sys/conf/GENERIC
parente07638478523e3044e34296f59801b5f97c65c4e (diff)
cleanup around the pipex. naming style, delete or update comments.
no functional changes.
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index c650efbe3f6..64dfe5f77c0 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.191 2012/09/05 17:41:13 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.192 2012/09/19 17:50:17 yasuoka Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -60,7 +60,7 @@ option IPSEC # IPsec
#option KEY # PF_KEY (implied by IPSEC)
option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
-option PIPEX # Pppac IP EXtension, for npppd
+option PIPEX # Ppp IP EXtension, for npppd
option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast
option MPLS # Multi-Protocol Label Switching