summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2000-01-09 22:00:27 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2000-01-09 22:00:27 +0000
commit8f8953eb3c984f4a840336aa6e50f76aa9d66e55 (patch)
tree0388a22baf91c1711a2d671a1e23db65bdcba195 /sys/conf/GENERIC
parente143917a91709dc58b159a4cef5fc824d6f66c3a (diff)
add INET6 into conf/GENERIC.
add pseudo-devices for IPv6 into arch/*/conf/GENERIC. nuke arch/*/conf/GENERIC.v6.
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 354b6fad7a0..6cc6c72c7d3 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.60 2000/01/08 04:34:37 angelos Exp $
+# $OpenBSD: GENERIC,v 1.61 2000/01/09 22:00:16 itojun Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -61,6 +61,7 @@ option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP
+option INET6 # IPv6 (needs INET)
option IPSEC # IPsec
#option KEY # PF_KEY (implied by IPSEC)
#option NS # XNS