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/i386 | |
| 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/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC.v6 | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 331185d1979..33a44783441 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.153 2000/01/09 01:42:25 jason Exp $ +# $OpenBSD: GENERIC,v 1.154 2000/01/09 22:00:20 itojun Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -329,5 +329,8 @@ pseudo-device pctr 1 pseudo-device mtrr 1 # Memory range attributes control pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 #option DEBUG_ISAPNP diff --git a/sys/arch/i386/conf/GENERIC.v6 b/sys/arch/i386/conf/GENERIC.v6 deleted file mode 100644 index 309659cff00..00000000000 --- a/sys/arch/i386/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/i386/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 |