[src/trunk]: src/sys/arch Cleanup includes.

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

details:   https://anonhg.NetBSD.org/src/rev/93e95df0de29
branches:  trunk
changeset: 766266:93e95df0de29
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 05:15:59 2011 +0000

description:
Cleanup includes.

diffstat:

 sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c |  10 ++++++----
 sys/arch/powerpc/booke/copyin.c           |   6 +++---
 sys/arch/powerpc/booke/copyout.c          |   8 +++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 8fb7002e7853 -r 93e95df0de29 sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c
--- a/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c Mon Jun 20 05:04:10 2011 +0000
+++ b/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c Mon Jun 20 05:15:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cs_mainbus.c,v 1.5 2011/06/18 06:44:27 matt Exp $   */
+/*     $NetBSD: if_cs_mainbus.c,v 1.6 2011/06/20 05:15:59 matt Exp $   */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.5 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.6 2011/06/20 05:15:59 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include "rnd.h"
 #if NRND > 0
@@ -50,10 +51,11 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <machine/bus.h>
+#include <powerpc/psl.h>
+
 #include <machine/pio.h>
 #include <machine/pmppc.h>
-#include <arch/evbppc/pmppc/dev/mainbus.h>
+#include <evbppc/pmppc/dev/mainbus.h>
 
 #include <dev/ic/cs89x0reg.h>
 #include <dev/ic/cs89x0var.h>
diff -r 8fb7002e7853 -r 93e95df0de29 sys/arch/powerpc/booke/copyin.c
--- a/sys/arch/powerpc/booke/copyin.c   Mon Jun 20 05:04:10 2011 +0000
+++ b/sys/arch/powerpc/booke/copyin.c   Mon Jun 20 05:15:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copyin.c,v 1.3 2011/02/17 13:53:32 matt Exp $  */
+/*     $NetBSD: copyin.c,v 1.4 2011/06/20 05:20:37 matt Exp $  */
 
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -36,12 +36,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyin.c,v 1.3 2011/02/17 13:53:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyin.c,v 1.4 2011/06/20 05:20:37 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/lwp.h>
 
-#include <machine/pcb.h>
+#include <powerpc/pcb.h>
 
 #include <powerpc/booke/cpuvar.h>
 
diff -r 8fb7002e7853 -r 93e95df0de29 sys/arch/powerpc/booke/copyout.c
--- a/sys/arch/powerpc/booke/copyout.c  Mon Jun 20 05:04:10 2011 +0000
+++ b/sys/arch/powerpc/booke/copyout.c  Mon Jun 20 05:15:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copyout.c,v 1.2 2011/01/18 01:02:52 matt Exp $ */
+/*     $NetBSD: copyout.c,v 1.3 2011/06/20 05:17:24 matt Exp $ */
 
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -36,12 +36,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyout.c,v 1.2 2011/01/18 01:02:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyout.c,v 1.3 2011/06/20 05:17:24 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/lwp.h>
 
-#include <machine/pcb.h>
+#include <powerpc/pcb.h>
+
+#include <powerpc/booke/cpuvar.h>
 
 static inline void
 copyout_uint8(uint8_t *udaddr, uint8_t data, register_t ds_msr)