diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-04 03:33:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-04 03:33:33 +0000 |
| commit | 52d586fb781bede238fab283a3fb2b149435a0ab (patch) | |
| tree | 456f0d7152b983255f9a4a94483a7cb8fc634a67 /sys/conf/GENERIC | |
| parent | b08399a50dfd0b2bf84c481842dde301d275479a (diff) | |
vlan in GENERIC (ti(4) now has an issue, jason will deal)
Diffstat (limited to 'sys/conf/GENERIC')
| -rw-r--r-- | sys/conf/GENERIC | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 508b085249b..3bf3ef1b56f 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.71 2001/04/09 20:40:49 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.72 2001/05/04 03:33:32 deraadt Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -86,9 +86,12 @@ pseudo-device loop 2 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP -pseudo-device sppp # Sync PPP/HDLC +pseudo-device sppp 1 # Sync PPP/HDLC pseudo-device tun 2 # network tunneling over tty pseudo-device enc 1 # IPSEC needs the encapsulation interface +pseudo-device bridge 2 # network bridging support +pseudo-device vlan 2 # IEEE 802.1Q VLAN +pseudo-device gre 1 # GRE encapsulation interface #pseudo-device strip 1 # Starmode Radio IP interface pseudo-device pty 64 # pseudo-terminals @@ -96,9 +99,6 @@ pseudo-device tb 1 # tablet line discipline pseudo-device vnd 4 # paging to files pseudo-device ccd 4 # concatenated disk devices pseudo-device ksyms 1 # kernel symbols device -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) |