Module Name: src
Committed By: matt
Date: Mon Jun 20 05:39:43 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: bus_space.c
Log Message:
Tidy up includes.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/powerpc/bus_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.26 src/sys/arch/powerpc/powerpc/bus_space.c:1.27
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.26 Sat Mar 5 15:25:52 2011
+++ src/sys/arch/powerpc/powerpc/bus_space.c Mon Jun 20 05:39:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.26 2011/03/05 15:25:52 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.27 2011/06/20 05:39:43 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.26 2011/03/05 15:25:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.27 2011/06/20 05:39:43 matt Exp $");
+
+#define _POWERPC_BUS_SPACE_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,12 +42,10 @@
#include <sys/endian.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
-#define _POWERPC_BUS_SPACE_PRIVATE
-#include <machine/bus.h>
-
#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
#include <powerpc/spr.h>
#include <powerpc/oea/bat.h>
@@ -53,8 +53,6 @@
#include <powerpc/oea/pte.h>
#include <powerpc/oea/spr.h>
#include <powerpc/oea/sr_601.h>
-
-extern unsigned long oeacpufeat;
#endif
/* read_N */
