summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/hppa/conf/RAMDISK3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
-rw-r--r--sys/arch/macppc/conf/RAMDISK3
-rw-r--r--sys/arch/sparc64/conf/RAMDISK3
6 files changed, 12 insertions, 6 deletions
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index ed12a268f22..231a9779bd3 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.77 2009/01/06 23:03:16 jasper Exp $
+# $OpenBSD: RAMDISKBIG,v 1.78 2009/04/28 17:10:23 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -318,6 +318,7 @@ wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0
pseudo-device bpfilter 1
+pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device loop
pseudo-device rd 1
pseudo-device wsmux 2
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 8500f41632c..9f45ec503b3 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.103 2009/04/14 12:58:37 jsg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.104 2009/04/28 17:10:24 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -353,6 +353,7 @@ ukphy* at mii? # "unknown" PHYs
pseudo-device loop 1 # network loopback
#pseudo-device sl 1 # CSLIP
#pseudo-device ppp 1 # PPP
+pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
pseudo-device ccd 4 # concatenated disk devices
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index dbe6aa67fae..e53b7622231 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.87 2009/01/06 23:03:16 jasper Exp $
+# $OpenBSD: RAMDISK,v 1.88 2009/04/28 17:10:24 deraadt Exp $
#
# Diskless kernel config
#
@@ -340,6 +340,7 @@ cd* at scsibus?
pseudo-device rd 1 # ramdisk
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
+pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device ksyms 1 # kernel symbols device
#pseudo-device ccd 4 # concatenated disk devices
pseudo-device wsmux 2
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 53ce97c4eca..9ffc4147763 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.169 2009/04/14 12:58:37 jsg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.170 2009/04/28 17:10:24 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -436,6 +436,7 @@ ukphy* at mii? # "unknown" PHYs
pseudo-device loop 1 # network loopback
#pseudo-device sl 1 # CSLIP
#pseudo-device ppp 1 # PPP
+pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
pseudo-device ccd 4 # concatenated disk devices
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index e9fa6f22674..5e941e36661 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.85 2009/02/10 19:06:40 damien Exp $
+# $OpenBSD: RAMDISK,v 1.86 2009/04/28 17:10:24 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -230,6 +230,7 @@ cd* at scsibus?
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
+pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device rd 1 # ram disk
pseudo-device wsmux 2 # mouse & keyboard multiplexor
pseudo-device bio 1 # ioctl multiplexing device
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index c4a9fc37a0a..0c767984c8d 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.87 2009/03/29 21:57:26 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.88 2009/04/28 17:10:24 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -316,3 +316,4 @@ prtc0 at mainbus0
pseudo-device rd 2 # ramdisk
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
+pseudo-device vlan # IEEE 802.1Q VLAN