diff options
author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-01-09 22:00:27 +0000 |
---|---|---|
committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-01-09 22:00:27 +0000 |
commit | 8f8953eb3c984f4a840336aa6e50f76aa9d66e55 (patch) | |
tree | 0388a22baf91c1711a2d671a1e23db65bdcba195 /sys/arch/pmax/conf | |
parent | e143917a91709dc58b159a4cef5fc824d6f66c3a (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/pmax/conf')
-rw-r--r-- | sys/arch/pmax/conf/GENERIC | 5 | ||||
-rw-r--r-- | sys/arch/pmax/conf/GENERIC.v6 | 7 |
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 |