From a88d889485b487de25e817424277f2b42691f7f1 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 18 Jul 2015 00:48:06 +0000
Subject: Shuffle include file ordering in preparation for future changes in
 vgavar.h, which will have it depend upon wsdisplayvar.h.

---
 sys/dev/ic/vga.c             | 4 ++--
 sys/dev/ic/vga_subr.c        | 4 ++--
 sys/dev/isa/vga_isa.c        | 7 ++++---
 sys/dev/pci/vga_pci.c        | 4 ++--
 sys/dev/pci/vga_pci_common.c | 2 ++
 5 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 12392171d65..bc8639282ed 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.65 2015/03/29 18:45:22 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.66 2015/07/18 00:48:05 miod Exp $ */
 /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
 
 /*-
@@ -70,12 +70,12 @@
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/unicode.h>
 
+#include <dev/ic/vgavar.h>
 #include <dev/ic/pcdisplay.h>
 
 static struct vgafont {
diff --git a/sys/dev/ic/vga_subr.c b/sys/dev/ic/vga_subr.c
index 1cec569f1b5..1b9d14e809c 100644
--- a/sys/dev/ic/vga_subr.c
+++ b/sys/dev/ic/vga_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_subr.c,v 1.4 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: vga_subr.c,v 1.5 2015/07/18 00:48:05 miod Exp $ */
 /* $NetBSD: vga_subr.c,v 1.6 2000/01/25 02:44:03 ad Exp $ */
 
 /*
@@ -36,9 +36,9 @@
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
 
 #include <dev/wscons/wsdisplayvar.h>
+#include <dev/ic/vgavar.h>
 
 static void fontram(struct vga_handle *);
 static void textram(struct vga_handle *);
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index f337f0ddb8a..c55173d1399 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_isa.c,v 1.9 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: vga_isa.c,v 1.10 2015/07/18 00:48:05 miod Exp $ */
 /* $NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp $ */
 
 /*
@@ -39,12 +39,13 @@
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
-#include <dev/isa/vga_isavar.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 
+#include <dev/ic/vgavar.h>
+#include <dev/isa/vga_isavar.h>
+
 struct vga_isa_softc {
 	struct device sc_dev; 
 #if 0
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 1a1a896bf35..ea0b1852732 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.84 2015/03/29 18:45:22 miod Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.85 2015/07/18 00:48:05 miod Exp $ */
 /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
 
 /*
@@ -84,11 +84,11 @@
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
 #include <dev/pci/vga_pcivar.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
+#include <dev/ic/vgavar.h>
 
 #ifdef X86EMU
 #include <machine/vga_post.h>
diff --git a/sys/dev/pci/vga_pci_common.c b/sys/dev/pci/vga_pci_common.c
index 8d2f392ceae..17890104256 100644
--- a/sys/dev/pci/vga_pci_common.c
+++ b/sys/dev/pci/vga_pci_common.c
@@ -33,6 +33,8 @@
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
+
+#include <dev/wscons/wsdisplayvar.h>
 #include <dev/ic/vgavar.h>
 #include <dev/pci/vga_pcivar.h>
 
-- 
cgit v1.2.3