remove unused vesafb code, had been commented out and not compiled in for

7 years (for some parts, 9 years), and was only ever referenced in i386
anyway.

ok jsg@, matthieu@, armani@

3 files changed, 3 insertions, 25 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 91743e1c8be..d14dfbb1b67 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.802 2015/07/23 00:38:06 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.803 2015/08/20 04:41:46 mlarkin Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -383,11 +383,6 @@ drm*		at radeondrm?
 wsdisplay0	at radeondrm? console 1
 wsdisplay*	at radeondrm?
 
-#option		VESABIOSVERBOSE
-#option		VESAFB		# VESA bios framebuffer support for X11
-#vesabios0	at mainbus?
-
-
 pcppi0		at isa?
 
 com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 25e96b1cbfe..b41261865b2 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.225 2015/07/21 03:38:22 reyk Exp $
+#	$OpenBSD: files.i386,v 1.226 2015/08/20 04:41:46 mlarkin Exp $
 #
 # new style config file for i386 architecture
 #
@@ -402,11 +402,6 @@ device	esm
 attach	esm at mainbus
 file	arch/i386/i386/esm.c			esm needs-flag
 
-#
-# VESA
-#
-include "dev/vesa/files.vesa"
-
 #include "dev/rasops/files.rasops"
 
 # quad support is necessary for 32 bit architectures
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 29d17e73a34..218c856f042 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.52 2015/07/23 06:21:37 reyk Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.53 2015/08/20 04:41:46 mlarkin Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $	*/
 
 /*
@@ -52,7 +52,6 @@
 #include "acpi.h"
 #include "ipmi.h"
 #include "esm.h"
-#include "vesabios.h"
 #include "amdmsr.h"
 #include "pvbus.h"
 
@@ -81,10 +80,6 @@
 #include <arch/i386/i386/esmvar.h>
 #endif
 
-#if NVESABIOS > 0
-#include <dev/vesa/vesabiosvar.h>
-#endif
-
 int	mainbus_match(struct device *, void *, void *);
 void	mainbus_attach(struct device *, struct device *, void *);
 
@@ -202,13 +197,6 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 	if (cpusensors_setup != NULL)
 		cpusensors_setup(&cpu_info_primary);
 
-#if NVESABIOS > 0
-	if (vbeprobe())	{
-		mba.mba_busname = "vesabios";
-		config_found(self, &mba.mba_busname, NULL);
-	}
-#endif
-
 #if NESM > 0
 	{
 		memset(&mba.mba_eaa, 0, sizeof(mba.mba_eaa));