summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorChris Cappuccio <chris@cvs.openbsd.org>2000-04-26 19:08:24 +0000
committerChris Cappuccio <chris@cvs.openbsd.org>2000-04-26 19:08:24 +0000
commitaecd207f2586795a74911914969e8ea149aeffd2 (patch)
treed9a06bbda4edde4954b756c91ce6b6aa3131d399 /sys/conf/GENERIC
parent32d78169695f3413282c6aa22d9c5dc2fca41650 (diff)
pseudo-device vlan (commented out for now)
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 7c75dc0afba..07bb9420cc1 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.64 2000/03/22 18:08:12 provos Exp $
+# $OpenBSD: GENERIC,v 1.65 2000/04/26 19:08:23 chris Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -95,6 +95,7 @@ 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
option BOOT_CONFIG # add support for boot -c