From 774ef66058108a31e84ba5ff33e7b7d930385ab0 Mon Sep 17 00:00:00 2001
From: lkestel <lkestel@NetBSD.org>
Date: Sat, 30 Jul 1994 04:21:42 +0000
Subject: [PATCH] Moved adbsys.h grfioctl.h and keyboard.h to include to make
 desktop and X compile more cleanly.

---
 sys/arch/mac68k/dev/adbsys.c | 10 +++++++---
 sys/arch/mac68k/dev/grf.c    |  4 ++--
 sys/arch/mac68k/dev/grf_gb.c |  4 ++--
 sys/arch/mac68k/dev/ite.c    |  6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c
index 7614600a38bf..9a3fab56e975 100644
--- a/sys/arch/mac68k/dev/adbsys.c
+++ b/sys/arch/mac68k/dev/adbsys.c
@@ -30,13 +30,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: adbsys.c,v 1.3 1994/07/21 06:36:51 lkestel Exp $
+ * $Id: adbsys.c,v 1.4 1994/07/30 04:21:42 lkestel Exp $
  *
  */
 
 /*
  * $Log: adbsys.c,v $
- * Revision 1.3  1994/07/21 06:36:51  lkestel
+ * Revision 1.4  1994/07/30 04:21:42  lkestel
+ * Moved adbsys.h grfioctl.h and keyboard.h to include to make desktop
+ * and X compile more cleanly.
+ *
+ * Revision 1.3  1994/07/21  06:36:51  lkestel
  * Fixed a few bugs in the key-repeat function and disabled key-repeat
  * when /dev/adb is closed to avoid infinite repeat problem.  Brad claims
  * that he's got this solved in his version...
@@ -59,7 +63,7 @@
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include "../mac68k/via.h"
-#include "adbsys.h"
+#include <machine/adbsys.h>
 #include "bounds.h"
 
 extern unsigned char keyboard[128][3];
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index 449f8e2874bd..1a5b25ec09f0 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: grf.c 1.31 91/01/21$
  *
  *	from: from: from: from: @(#)grf.c	7.8 (Berkeley) 5/7/91
- *	$Id: grf.c,v 1.8 1994/07/09 06:49:34 briggs Exp $
+ *	$Id: grf.c,v 1.9 1994/07/30 04:21:44 lkestel Exp $
  */
 
 /*
@@ -61,7 +61,7 @@
 
 #include <sys/device.h>
 #include "nubus.h"
-#include "grfioctl.h"
+#include <machine/grfioctl.h>
 #include "grfvar.h"
 
 #include <machine/cpu.h>
diff --git a/sys/arch/mac68k/dev/grf_gb.c b/sys/arch/mac68k/dev/grf_gb.c
index 68ecadb1af25..d9439d476179 100644
--- a/sys/arch/mac68k/dev/grf_gb.c
+++ b/sys/arch/mac68k/dev/grf_gb.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: grf_gb.c 1.16 91/04/02$
  *
  *	from: @(#)grf_gb.c	7.4 (Berkeley) 5/7/91
- *	$Id: grf_gb.c,v 1.4 1994/06/26 13:02:43 briggs Exp $
+ *	$Id: grf_gb.c,v 1.5 1994/07/30 04:21:45 lkestel Exp $
  */
 
 #include "grf.h"
@@ -54,7 +54,7 @@
 #include <sys/param.h>
 #include <sys/errno.h>
 
-#include "grfioctl.h"
+#include <machine/grfioctl.h>
 #include "grfvar.h"
 #include "grf_gbreg.h"
 
diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c
index 8a8985497b5d..62ead9a0ad1d 100644
--- a/sys/arch/mac68k/dev/ite.c
+++ b/sys/arch/mac68k/dev/ite.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: ite.c 1.28 92/12/20$
  *
  *	from: @(#)ite.c	8.2 (Berkeley) 1/12/94
- *	$Id: ite.c,v 1.3 1994/07/21 06:35:49 lkestel Exp $
+ *	$Id: ite.c,v 1.4 1994/07/30 04:21:47 lkestel Exp $
  */
 
 /*
@@ -67,8 +67,8 @@
 #include <machine/frame.h>
 
 #define KEYBOARD_ARRAY
-#include "keyboard.h"
-#include "adbsys.h"
+#include <machine/keyboard.h>
+#include <machine/adbsys.h>
 
 #include "6x10.h"
 #define CHARWIDTH	6