summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k
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/arch/mac68k
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/arch/mac68k')
-rw-r--r--sys/arch/mac68k/conf/GENERIC6
-rw-r--r--sys/arch/mac68k/conf/GENERIC.v67
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 8ba2f06ed6a..85d8f10b8e2 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.24 1998/05/08 22:21:34 gene Exp $
+# $OpenBSD: GENERIC,v 1.25 2000/01/09 22:00:20 itojun Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERIC - an all-in-one kernel for the mac68k
@@ -62,3 +62,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
ch* at scsibus? target ? lun ? # SCSI autochangers
ss* at scsibus? target ? lun ? # SCSI scanners
uk* at scsibus? target ? lun ? # SCSI unknown
+
+# for IPv6
+pseudo-device gif 4
+#pseudo-device faith 1
diff --git a/sys/arch/mac68k/conf/GENERIC.v6 b/sys/arch/mac68k/conf/GENERIC.v6
deleted file mode 100644
index 1e76f7f68a9..00000000000
--- a/sys/arch/mac68k/conf/GENERIC.v6
+++ /dev/null
@@ -1,7 +0,0 @@
-include "arch/mac68k/conf/GENERIC"
-
-options INET6 # IPV6
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1