Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:39:30 UTC 2011
Modified Files:
src/sys/arch/mips/alchemy: au1000.c au1100.c au1500.c au1550.c
au_chipdep.c au_cpureg_mem.c au_himem_space.c au_icu.c au_timer.c
au_wired_space.c aubus.c
src/sys/arch/mips/alchemy/dev: augpio.c aupci.c aupsc.c aurtc.c
ausmbus_psc.c auspi.c com_aubus.c if_aumac.c ohci_aubus.c
src/sys/arch/mips/alchemy/include: aubusvar.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/alchemy/au1000.c \
src/sys/arch/mips/alchemy/au1100.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/alchemy/au1500.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/alchemy/au1550.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/alchemy/au_chipdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/alchemy/au_cpureg_mem.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/alchemy/au_himem_space.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/alchemy/au_icu.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/alchemy/au_timer.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/alchemy/au_wired_space.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/alchemy/aubus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/alchemy/dev/augpio.c \
src/sys/arch/mips/alchemy/dev/aupsc.c \
src/sys/arch/mips/alchemy/dev/com_aubus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/alchemy/dev/aupci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/alchemy/dev/aurtc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/alchemy/dev/auspi.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/alchemy/dev/if_aumac.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/alchemy/dev/ohci_aubus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/alchemy/include/aubusvar.h
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/mips/alchemy/au1000.c
diff -u src/sys/arch/mips/alchemy/au1000.c:1.8 src/sys/arch/mips/alchemy/au1000.c:1.9
--- src/sys/arch/mips/alchemy/au1000.c:1.8 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au1000.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1000.c,v 1.8 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1000.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -100,7 +100,7 @@
__KERNEL_RCSID(0, "$NetBSD");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au1100.c
diff -u src/sys/arch/mips/alchemy/au1100.c:1.8 src/sys/arch/mips/alchemy/au1100.c:1.9
--- src/sys/arch/mips/alchemy/au1100.c:1.8 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au1100.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1100.c,v 1.8 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.8 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au1500.c
diff -u src/sys/arch/mips/alchemy/au1500.c:1.9 src/sys/arch/mips/alchemy/au1500.c:1.10
--- src/sys/arch/mips/alchemy/au1500.c:1.9 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au1500.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1500.c,v 1.9 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.9 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au1550.c
diff -u src/sys/arch/mips/alchemy/au1550.c:1.12 src/sys/arch/mips/alchemy/au1550.c:1.13
--- src/sys/arch/mips/alchemy/au1550.c:1.12 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au1550.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au1550.c,v 1.12 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au_chipdep.c
diff -u src/sys/arch/mips/alchemy/au_chipdep.c:1.2 src/sys/arch/mips/alchemy/au_chipdep.c:1.3
--- src/sys/arch/mips/alchemy/au_chipdep.c:1.2 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au_chipdep.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_chipdep.c,v 1.2 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.2 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/au_cpureg_mem.c
diff -u src/sys/arch/mips/alchemy/au_cpureg_mem.c:1.5 src/sys/arch/mips/alchemy/au_cpureg_mem.c:1.6
--- src/sys/arch/mips/alchemy/au_cpureg_mem.c:1.5 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/alchemy/au_cpureg_mem.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_cpureg_mem.c,v 1.5 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: au_cpureg_mem.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_cpureg_mem.c,v 1.5 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_cpureg_mem.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/auvar.h>
#include <mips/alchemy/include/aubusvar.h>
Index: src/sys/arch/mips/alchemy/au_himem_space.c
diff -u src/sys/arch/mips/alchemy/au_himem_space.c:1.11 src/sys/arch/mips/alchemy/au_himem_space.c:1.12
--- src/sys/arch/mips/alchemy/au_himem_space.c:1.11 Mon Jun 7 13:33:33 2010
+++ src/sys/arch/mips/alchemy/au_himem_space.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_himem_space.c,v 1.11 2010/06/07 13:33:33 martin Exp $ */
+/* $NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.11 2010/06/07 13:33:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $");
/*
* This provides mappings for the upper I/O regions used on some
@@ -77,7 +77,7 @@
#include <sys/endian.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/au_himem_space.h>
Index: src/sys/arch/mips/alchemy/au_icu.c
diff -u src/sys/arch/mips/alchemy/au_icu.c:1.26 src/sys/arch/mips/alchemy/au_icu.c:1.27
--- src/sys/arch/mips/alchemy/au_icu.c:1.26 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au_icu.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_icu.c,v 1.26 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.26 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -80,7 +80,7 @@
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: src/sys/arch/mips/alchemy/au_timer.c
diff -u src/sys/arch/mips/alchemy/au_timer.c:1.10 src/sys/arch/mips/alchemy/au_timer.c:1.11
--- src/sys/arch/mips/alchemy/au_timer.c:1.10 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/au_timer.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_timer.c,v 1.10 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au_timer.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_timer.c,v 1.10 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_timer.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/lwp.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
Index: src/sys/arch/mips/alchemy/au_wired_space.c
diff -u src/sys/arch/mips/alchemy/au_wired_space.c:1.6 src/sys/arch/mips/alchemy/au_wired_space.c:1.7
--- src/sys/arch/mips/alchemy/au_wired_space.c:1.6 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/alchemy/au_wired_space.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au_wired_space.c,v 1.6 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.6 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $");
/*
* This provides mappings for the upper I/O regions used on some
@@ -75,7 +75,7 @@
#include <sys/malloc.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <machine/wired_map.h>
#include <mips/alchemy/include/au_wired_space.h>
Index: src/sys/arch/mips/alchemy/aubus.c
diff -u src/sys/arch/mips/alchemy/aubus.c:1.21 src/sys/arch/mips/alchemy/aubus.c:1.22
--- src/sys/arch/mips/alchemy/aubus.c:1.21 Sun Feb 20 07:48:36 2011
+++ src/sys/arch/mips/alchemy/aubus.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aubus.c,v 1.21 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.21 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $");
#include "locators.h"
@@ -108,7 +108,7 @@
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/dev/augpio.c
diff -u src/sys/arch/mips/alchemy/dev/augpio.c:1.5 src/sys/arch/mips/alchemy/dev/augpio.c:1.6
--- src/sys/arch/mips/alchemy/dev/augpio.c:1.5 Fri Mar 24 18:22:42 2006
+++ src/sys/arch/mips/alchemy/dev/augpio.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: augpio.c,v 1.5 2006/03/24 18:22:42 gdamore Exp $ */
+/* $NetBSD: augpio.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.5 2006/03/24 18:22:42 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -44,7 +44,7 @@
#include <dev/gpio/gpiovar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: src/sys/arch/mips/alchemy/dev/aupsc.c
diff -u src/sys/arch/mips/alchemy/dev/aupsc.c:1.5 src/sys/arch/mips/alchemy/dev/aupsc.c:1.6
--- src/sys/arch/mips/alchemy/dev/aupsc.c:1.5 Mon Oct 2 07:32:16 2006
+++ src/sys/arch/mips/alchemy/dev/aupsc.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aupsc.c,v 1.5 2006/10/02 07:32:16 gdamore Exp $ */
+/* $NetBSD: aupsc.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.5 2006/10/02 07:32:16 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
#include "locators.h"
@@ -42,7 +42,7 @@
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: src/sys/arch/mips/alchemy/dev/com_aubus.c
diff -u src/sys/arch/mips/alchemy/dev/com_aubus.c:1.5 src/sys/arch/mips/alchemy/dev/com_aubus.c:1.6
--- src/sys/arch/mips/alchemy/dev/com_aubus.c:1.5 Fri Mar 14 15:09:10 2008
+++ src/sys/arch/mips/alchemy/dev/com_aubus.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_aubus.c,v 1.5 2008/03/14 15:09:10 cube Exp $ */
+/* $NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.5 2008/03/14 15:09:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -44,7 +44,7 @@
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comvar.h>
#include <mips/alchemy/include/aureg.h>
Index: src/sys/arch/mips/alchemy/dev/aupci.c
diff -u src/sys/arch/mips/alchemy/dev/aupci.c:1.10 src/sys/arch/mips/alchemy/dev/aupci.c:1.11
--- src/sys/arch/mips/alchemy/dev/aupci.c:1.10 Tue May 17 17:34:51 2011
+++ src/sys/arch/mips/alchemy/dev/aupci.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aupci.c,v 1.10 2011/05/17 17:34:51 dyoung Exp $ */
+/* $NetBSD: aupci.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.10 2011/05/17 17:34:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,7 +48,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/pte.h>
Index: src/sys/arch/mips/alchemy/dev/aurtc.c
diff -u src/sys/arch/mips/alchemy/dev/aurtc.c:1.12 src/sys/arch/mips/alchemy/dev/aurtc.c:1.13
--- src/sys/arch/mips/alchemy/dev/aurtc.c:1.12 Sat Dec 12 14:44:09 2009
+++ src/sys/arch/mips/alchemy/dev/aurtc.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aurtc.c,v 1.12 2009/12/12 14:44:09 tsutsui Exp $ */
+/* $NetBSD: aurtc.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.12 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
diff -u src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.9 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.10
--- src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.9 Mon Apr 20 12:11:50 2009
+++ src/sys/arch/mips/alchemy/dev/ausmbus_psc.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ausmbus_psc.c,v 1.9 2009/04/20 12:11:50 pgoyette Exp $ */
+/* $NetBSD: ausmbus_psc.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.9 2009/04/20 12:11:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $");
#include "locators.h"
@@ -42,7 +42,7 @@
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/dev/aupscreg.h>
Index: src/sys/arch/mips/alchemy/dev/auspi.c
diff -u src/sys/arch/mips/alchemy/dev/auspi.c:1.4 src/sys/arch/mips/alchemy/dev/auspi.c:1.5
--- src/sys/arch/mips/alchemy/dev/auspi.c:1.4 Wed Jun 8 23:05:48 2011
+++ src/sys/arch/mips/alchemy/dev/auspi.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $ */
+/* $NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $");
#include "locators.h"
@@ -53,7 +53,7 @@
#include <sys/errno.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: src/sys/arch/mips/alchemy/dev/if_aumac.c
diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.29 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.30
--- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.29 Fri Nov 12 13:40:10 2010
+++ src/sys/arch/mips/alchemy/dev/if_aumac.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $ */
+/* $NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $");
#include "rnd.h"
@@ -74,7 +74,7 @@
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: src/sys/arch/mips/alchemy/dev/ohci_aubus.c
diff -u src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.14 src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.15
--- src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.14 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/alchemy/dev/ohci_aubus.c Fri Jul 1 18:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_aubus.c,v 1.14 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.14 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/mips/alchemy/include/aubusvar.h
diff -u src/sys/arch/mips/alchemy/include/aubusvar.h:1.4 src/sys/arch/mips/alchemy/include/aubusvar.h:1.5
--- src/sys/arch/mips/alchemy/include/aubusvar.h:1.4 Thu Jul 13 22:56:01 2006
+++ src/sys/arch/mips/alchemy/include/aubusvar.h Fri Jul 1 18:39:30 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: aubusvar.h,v 1.4 2006/07/13 22:56:01 gdamore Exp $ */
+/* $NetBSD: aubusvar.h,v 1.5 2011/07/01 18:39:30 dyoung Exp $ */
#ifndef _MIPS_ALCHEMY_DEV_AUBUSVAR_H_
#define _MIPS_ALCHEMY_DEV_AUBUSVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Machine-dependent structures for autoconfiguration
