summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2015-09-03 18:00:12 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2015-09-03 18:00:12 +0000
commitc7ceecb96188722dbff9c7105e5f0a398bac80f4 (patch)
tree78c5d0174a3e01a0fb03b55f6d72bc5faafae191 /sys
parentf78e01d3ec782ad94a5b99f7ac21e7604f1aeb7b (diff)
No real point in having efifb(4) on the floppies; we want it on everything
else! ok deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/RAMDISK5
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD5
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 6668d822545..f4939df3d46 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.69 2015/08/31 03:42:51 yasuoka Exp $
+# $OpenBSD: RAMDISK,v 1.70 2015/09/03 18:00:11 kettenis Exp $
machine amd64
maxusers 4
@@ -75,9 +75,6 @@ wsdisplay* at vga?
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
-efifb0 at mainbus? # EFI Framebuffer
-wsdisplay0 at efifb? console 1
-
mpi* at pci? # LSI Logic Message Passing Interface
mfi* at pci? # LSI MegaRAID SAS controllers
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index ae9e376f52e..612ed01ff1a 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.153 2015/07/17 22:52:28 tedu Exp $
+# $OpenBSD: RAMDISK_CD,v 1.154 2015/09/03 18:00:11 kettenis Exp $
machine amd64
maxusers 4
@@ -112,6 +112,9 @@ vga0 at isa?
vga* at pci?
wsdisplay* at vga?
+efifb0 at mainbus? # EFI Framebuffer
+wsdisplay0 at efifb? console 1
+
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 5