[src/trunk]: src/sys/arch/sparc/dev Re-arrange headers; drop <machine/cpu.h>.

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

details:   https://anonhg.NetBSD.org/src/rev/56eb0c37ce80
branches:  trunk
changeset: 494632:56eb0c37ce80
user:      pk <pk%NetBSD.org@localhost>
date:      Sun Jul 09 20:38:34 2000 +0000

description:
Re-arrange headers; drop <machine/cpu.h>.

diffstat:

 sys/arch/sparc/dev/cgfourteen.c |  11 +++++++----
 sys/arch/sparc/dev/cgsix.c      |  12 ++++++------
 sys/arch/sparc/dev/cgsix_obio.c |   4 +---
 sys/arch/sparc/dev/cgsix_sbus.c |   9 +++------
 sys/arch/sparc/dev/cgthree.c    |   6 +++---
 sys/arch/sparc/dev/p9100.c      |   9 +++++----
 6 files changed, 25 insertions(+), 26 deletions(-)

diffs (182 lines):

diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/cgfourteen.c
--- a/sys/arch/sparc/dev/cgfourteen.c   Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/cgfourteen.c   Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteen.c,v 1.18 2000/06/29 07:40:06 mrg Exp $ */
+/*     $NetBSD: cgfourteen.c,v 1.19 2000/07/09 20:38:35 pk Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -89,11 +89,14 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <machine/bus.h>
+#include <machine/autoconf.h>
+#include <machine/conf.h>
+
+#include <dev/sbus/sbusvar.h>
+
 #include <machine/fbio.h>
-#include <machine/autoconf.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
-#include <machine/conf.h>
 
 #include <sparc/dev/cgfourteenreg.h>
 #include <sparc/dev/cgfourteenvar.h>
diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/cgsix.c
--- a/sys/arch/sparc/dev/cgsix.c        Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/cgsix.c        Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.52 2000/06/29 07:40:06 mrg Exp $ */
+/*     $NetBSD: cgsix.c,v 1.53 2000/07/09 20:38:35 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -92,7 +92,6 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
-#include <machine/fbio.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
@@ -107,11 +106,10 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
-#include <machine/autoconf.h>
+#include <machine/fbio.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
-#include <machine/eeprom.h>
-#include <machine/conf.h>
+
+#include <dev/sbus/sbusvar.h>  /* XXX */
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
@@ -125,6 +123,8 @@
 #include <dev/wscons/wsconsio.h>
 #endif
 
+#include <machine/conf.h>
+
 static void    cg6_unblank __P((struct device *));
 
 /* cdevsw prototypes */
diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/cgsix_obio.c
--- a/sys/arch/sparc/dev/cgsix_obio.c   Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/cgsix_obio.c   Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix_obio.c,v 1.6 2000/06/29 07:40:06 mrg Exp $ */
+/*     $NetBSD: cgsix_obio.c,v 1.7 2000/07/09 20:38:34 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,13 +59,11 @@
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
 #include <machine/eeprom.h>
 #include <machine/conf.h>
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/cgsixreg.h>
 #include <sparc/dev/cgsixvar.h>
 #include <sparc/dev/pfourreg.h>
diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/cgsix_sbus.c
--- a/sys/arch/sparc/dev/cgsix_sbus.c   Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/cgsix_sbus.c   Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix_sbus.c,v 1.4 2000/06/29 07:40:06 mrg Exp $ */
+/*     $NetBSD: cgsix_sbus.c,v 1.5 2000/07/09 20:38:35 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,17 +59,14 @@
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
-#include <machine/eeprom.h>
-#include <machine/conf.h>
+
+#include <sparc/dev/sbusvar.h>
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/cgsixreg.h>
 #include <sparc/dev/cgsixvar.h>
 
-
 /* autoconfiguration driver */
 static int     cgsixmatch __P((struct device *, struct cfdata *, void *));
 static void    cgsixattach __P((struct device *, struct device *, void *));
diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/cgthree.c
--- a/sys/arch/sparc/dev/cgthree.c      Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/cgthree.c      Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgthree.c,v 1.47 2000/06/29 07:40:07 mrg Exp $ */
+/*     $NetBSD: cgthree.c,v 1.48 2000/07/09 20:38:34 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -102,14 +102,14 @@
 #include <machine/autoconf.h>
 #include <machine/fbio.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
-#include <machine/conf.h>
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
 #include <sparc/dev/cgthreereg.h>
 #include <sparc/dev/sbusvar.h>
 
+#include <machine/conf.h>
+
 /* per-display variables */
 struct cgthree_softc {
        struct device   sc_dev;         /* base device */
diff -r 044fa02e75bb -r 56eb0c37ce80 sys/arch/sparc/dev/p9100.c
--- a/sys/arch/sparc/dev/p9100.c        Sun Jul 09 14:26:34 2000 +0000
+++ b/sys/arch/sparc/dev/p9100.c        Sun Jul 09 20:38:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: p9100.c,v 1.12 2000/06/29 07:40:07 mrg Exp $ */
+/*     $NetBSD: p9100.c,v 1.13 2000/07/09 20:38:34 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -58,15 +58,14 @@
 #include <machine/autoconf.h>
 #include <machine/fbio.h>
 #include <machine/fbvar.h>
-#include <machine/cpu.h>
-#include <machine/conf.h>
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
 #if 0
 #include <sparc/dev/p9100reg.h>
 #endif
-#include <sparc/dev/sbusvar.h>
+
+#include <dev/sbus/sbusvar.h>
 
 #include "tctrl.h"
 #if NTCTRL > 0
@@ -74,6 +73,8 @@
 #include <sparc/dev/tctrlvar.h>
 #endif
 
+#include <machine/conf.h>
+
 /* per-display variables */
 struct p9100_softc {
        struct device   sc_dev;         /* base device */