[src/netbsd-3]: src/sys/arch/sparc64/dev Pull up revision 1.7 (requested by m...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/35c664f97b91
branches:  netbsd-3
changeset: 576021:35c664f97b91
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 07 17:27:32 2005 +0000

description:
Pull up revision 1.7 (requested by martin in ticket #376):
Make ffb take part in the /dev/fbN circus.

diffstat:

 sys/arch/sparc64/dev/ffb_mainbus.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r b8d4f058d37c -r 35c664f97b91 sys/arch/sparc64/dev/ffb_mainbus.c
--- a/sys/arch/sparc64/dev/ffb_mainbus.c        Tue Jun 07 17:27:26 2005 +0000
+++ b/sys/arch/sparc64/dev/ffb_mainbus.c        Tue Jun 07 17:27:32 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb_mainbus.c,v 1.5.10.1 2005/06/07 17:26:29 tron Exp $        */
+/*     $NetBSD: ffb_mainbus.c,v 1.5.10.2 2005/06/07 17:27:32 tron Exp $        */
 /*     $OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $       */
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.5.10.1 2005/06/07 17:26:29 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.5.10.2 2005/06/07 17:27:32 tron Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -47,9 +47,8 @@
 #include <machine/openfirm.h>
 
 #include <dev/wscons/wsconsio.h>
-#include <dev/wscons/wsdisplayvar.h>
-#include <dev/wscons/wscons_raster.h>
-#include <dev/rasops/rasops.h>
+#include <dev/sun/fbio.h>
+#include <dev/sun/fbvar.h>
 
 #include <sparc64/dev/ffbreg.h>
 #include <sparc64/dev/ffbvar.h>