Revert "kernel/vga: Remove some unneeded #ifdef/#define's."

This reverts commit 617e8b12b140696ebd906ac4c3e01ea56643c624.

Sorry, it wasn't unneeded at all.

diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c
index 288d1dc..29fdf50 100644 (file)
--- a/sys/dev/video/fb/vga.c
+++ b/sys/dev/video/fb/vga.c
@@ -47,7 +47,9 @@
 
 #include <machine/clock.h>
 #include <machine/md_var.h>
+#ifdef __i386__
 #include <machine/pc/bios.h>
+#endif
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -60,6 +62,10 @@
 #define VGA_DEBUG              0
 #endif
 
+/* machine/pc/bios.h has got too much i386-specific stuff in it */
+#ifndef BIOS_PADDRTOVADDR
+#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase)
+#endif
 int
 vga_probe_unit(int unit, video_adapter_t *buf, int flags)
 {