diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-03-08 03:37:21 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-03-08 03:37:21 +0000 |
| commit | 37b9458625cf8520c818e3a3cd00c6385f0bb78f (patch) | |
| tree | 55b53423574faeea86d2e7218c038f30272c1f42 /sys/conf | |
| parent | c133ffa9b430ff6130e9afcf1511f024b2c70afb (diff) | |
move gif* and faith* into sys/conf/GENERIC. deraadt and angelos ok
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 52f969e469f..3a10b83c947 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.68 2001/01/05 05:13:46 angelos Exp $ +# $OpenBSD: GENERIC,v 1.69 2001/03/08 03:37:16 itojun Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -100,4 +100,8 @@ pseudo-device bridge 2 # network bridging support #pseudo-device vlan 2 # IEEE 802.1Q VLAN pseudo-device gre 1 # GRE encapsulation interface +# for IPv6 +pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) +#pseudo-device faith 1 # IPv[46] tcp relay translation i/f + option BOOT_CONFIG # add support for boot -c |