sync w/ Net 960424

1 files changed, 7 insertions, 6 deletions

diff --git a/sys/arch/hp300/stand/ite_subr.c b/sys/arch/hp300/stand/ite_subr.c
index 4a7ceca585e..5be4068b1a3 100644
--- a/sys/arch/hp300/stand/ite_subr.c
+++ b/sys/arch/hp300/stand/ite_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_subr.c,v 1.7 1994/10/26 07:27:39 cgd Exp $	*/
+/*	$NetBSD: ite_subr.c,v 1.8 1996/03/03 04:23:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,11 +47,11 @@
 #ifdef ITECONSOLE
 
 #include <sys/param.h>
-#include <hp300/dev/itevar.h>
+#include <hp300/stand/itevar.h>
 #include <hp300/dev/itereg.h>
 
 ite_fontinfo(ip)
-	struct ite_softc *ip;
+	struct ite_data *ip;
 {
 	u_long fontaddr = getword(ip, getword(ip, FONTROM) + FONTADDR);
 
@@ -83,7 +83,7 @@ ite_fontinfo(ip)
 }
 
 ite_fontinit(ip)
-	register struct ite_softc *ip;
+	register struct ite_data *ip;
 {
 	int bytewidth = (((ip->ftwidth - 1) / 8) + 1);
 	int glyphsize = bytewidth * ip->ftheight;
@@ -111,14 +111,15 @@ ite_fontinit(ip)
  */
 u_char
 ite_readbyte(ip, disp)
-	struct ite_softc *ip;
+	struct ite_data *ip;
 	int disp;
 {
 	return((u_char) *(((u_char *)ip->regbase) + disp));
 }
 
+void
 ite_writeglyph(ip, fbmem, glyphp)
-	register struct ite_softc *ip;
+	register struct ite_data *ip;
 	register u_char *fbmem, *glyphp;
 {
 	register int bn;