[src/trunk]: src/sys/arch/sparc64 Remove implicit include <dev/sbus/sbusvar.h...

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

details:   https://anonhg.NetBSD.org/src/rev/593a816fe1a5
branches:  trunk
changeset: 763183:593a816fe1a5
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sat Mar 12 11:43:38 2011 +0000

description:
Remove implicit include <dev/sbus/sbusvar.h> from autoconf.h, and
add it explicitly in files depending on it.

diffstat:

 sys/arch/sparc64/dev/auxio.c        |  6 +++---
 sys/arch/sparc64/dev/fdc.c          |  6 +++---
 sys/arch/sparc64/dev/zs.c           |  5 +++--
 sys/arch/sparc64/include/autoconf.h |  3 +--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (97 lines):

diff -r 04c1b38c136e -r 593a816fe1a5 sys/arch/sparc64/dev/auxio.c
--- a/sys/arch/sparc64/dev/auxio.c      Sat Mar 12 11:42:57 2011 +0000
+++ b/sys/arch/sparc64/dev/auxio.c      Sat Mar 12 11:43:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auxio.c,v 1.20 2008/06/13 13:10:49 cegger Exp $        */
+/*     $NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $      */
 
 /*
  * Copyright (c) 2000, 2001 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.20 2008/06/13 13:10:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $");
 
 #include "opt_auxio.h"
 
@@ -49,7 +49,7 @@
 
 #include <dev/ebus/ebusreg.h>
 #include <dev/ebus/ebusvar.h>
-#include <sparc64/dev/sbusvar.h>
+#include <dev/sbus/sbusvar.h>
 #include <sparc64/dev/auxioreg.h>
 #include <sparc64/dev/auxiovar.h>
 
diff -r 04c1b38c136e -r 593a816fe1a5 sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c        Sat Mar 12 11:42:57 2011 +0000
+++ b/sys/arch/sparc64/dev/fdc.c        Sat Mar 12 11:43:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdc.c,v 1.33 2010/02/24 22:37:55 dyoung Exp $  */
+/*     $NetBSD: fdc.c,v 1.34 2011/03/12 11:43:38 nakayama Exp $        */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.33 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.34 2011/03/12 11:43:38 nakayama Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -141,7 +141,7 @@
 #elif SUN4U
 #include <dev/ebus/ebusreg.h>
 #include <dev/ebus/ebusvar.h>
-/* #include <sparc/sparc/auxreg.h> */
+#include <dev/sbus/sbusvar.h>
 #include <sparc64/dev/auxioreg.h>
 #include <sparc64/dev/auxiovar.h>
 #include <sparc64/dev/fdcreg.h>
diff -r 04c1b38c136e -r 593a816fe1a5 sys/arch/sparc64/dev/zs.c
--- a/sys/arch/sparc64/dev/zs.c Sat Mar 12 11:42:57 2011 +0000
+++ b/sys/arch/sparc64/dev/zs.c Sat Mar 12 11:43:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.69 2009/10/26 19:55:11 martin Exp $   */
+/*     $NetBSD: zs.c,v 1.70 2011/03/12 11:43:38 nakayama Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.69 2009/10/26 19:55:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.70 2011/03/12 11:43:38 nakayama Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -68,6 +68,7 @@
 #include <dev/sun/kbd_ms_ttyvar.h>
 #include <ddb/db_output.h>
 
+#include <dev/sbus/sbusvar.h>
 #include <sparc64/dev/cons.h>
 
 #include "ioconf.h"
diff -r 04c1b38c136e -r 593a816fe1a5 sys/arch/sparc64/include/autoconf.h
--- a/sys/arch/sparc64/include/autoconf.h       Sat Mar 12 11:42:57 2011 +0000
+++ b/sys/arch/sparc64/include/autoconf.h       Sat Mar 12 11:43:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.28 2008/04/28 20:23:36 martin Exp $ */
+/*     $NetBSD: autoconf.h,v 1.29 2011/03/12 11:43:38 nakayama Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@
 
 #include <machine/bus.h>
 #include <machine/promlib.h>
-#include <dev/sbus/sbusvar.h>
 
 /* This is used to map device classes to IPLs */
 struct intrmap {