summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-02-28 06:52:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-02-28 06:52:06 +0000
commit470111fb593f8df98cab9f9f1ca17a1b8cbf8440 (patch)
treef066502ac35fdf0cc464c9a4e965cee03850843c /sys/conf
parent808c95c79a2d06a85ff095aa8a52b706d143de2b (diff)
support bridging by default
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index adbacc958c0..84f07198272 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.42 1999/02/24 22:36:42 angelos Exp $
+# $OpenBSD: GENERIC,v 1.43 1999/02/28 06:52:05 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -83,5 +83,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
option BOOT_CONFIG # add support for boot -c