summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2012-11-16 02:15:39 +0000
committerBrad Smith <brad@cvs.openbsd.org>2012-11-16 02:15:39 +0000
commit8ef63ca2acef9d97eaef46e795b88baffbfcf25b (patch)
tree09fd6d10b2e54bcf8ef0e60a5f95f799842862cf /sys/arch/i386/conf
parentf0367247ce87be09db37a5bfe9223e00e635eff4 (diff)
Add oce(4) / mfii(4) and virtio devices
i386 CD image also build/boot tested by todd@ ok mikeb@ deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 51d25507dcd..9eb1764c7e5 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.193 2012/09/27 14:01:35 jsg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.194 2012/11/16 02:15:38 brad Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -208,6 +208,7 @@ gdt* at pci? # ICP Vortex GDT RAID controllers
#aac* at pci? # Adaptec FSA RAID controllers
ami* at pci? # AMI MegaRAID controllers
mfi* at pci? # LSI MegaRAID SAS controllers
+mfii* at pci? # LSI MegaRAID SAS Fusion controllers
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
cac* at eisa?
ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
@@ -319,6 +320,7 @@ em* at pci? # Intel Pro/1000 ethernet
gcu* at pci? # Intel EP80579 auxlliary mii device
ixgb* at pci? # Intel Pro/10Gb ethernet
ix* at pci? # Intel 82598EB 10Gb ethernet
+oce* at pci? # Emulex OneConnect 10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
re* at pci? # Realtek 8169/8169S/8110S
@@ -412,3 +414,8 @@ pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
pseudo-device wsmux 2
pseudo-device bio 1 # ioctl multiplexing device
+
+# Virtio devices
+virtio* at pci? # Virtio PCI device
+vioblk* at virtio? # Virtio block device
+vio* at virtio? # Virtio network device