summaryrefslogtreecommitdiff
path: root/sys/arch/pmax/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/pmax/conf')
-rw-r--r--sys/arch/pmax/conf/GENERIC5
-rw-r--r--sys/arch/pmax/conf/GENERIC.v67
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 20f64307ce3..0b1dcd44b70 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 1999/10/01 21:59:33 maja Exp $
+# $OpenBSD: GENERIC,v 1.16 2000/01/09 22:00:22 itojun Exp $
#
# GENERIC kernel for the distribition simpleroot
#
@@ -135,3 +135,6 @@ pseudo-device vnd 4 # virtual disk ick
pseudo-device ccd 4 # concatenated disks
pseudo-device bpfilter 16 # packet filter ports
pseudo-device pty 64 # pseudo ptys
+# for IPv6
+pseudo-device gif 4
+#pseudo-device faith 1
diff --git a/sys/arch/pmax/conf/GENERIC.v6 b/sys/arch/pmax/conf/GENERIC.v6
deleted file mode 100644
index 67dbade0246..00000000000
--- a/sys/arch/pmax/conf/GENERIC.v6
+++ /dev/null
@@ -1,7 +0,0 @@
-include "arch/pmax/conf/GENERIC"
-
-options INET6 # IPV6
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1