Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:01:31 UTC 2011
Modified Files:
src/sys/arch/mips/rmi: rmixl_com.c rmixl_cpunode.c rmixl_ehci.c
rmixl_gpio.c rmixl_intr.c rmixl_iobus.c rmixl_iobus_space.c
rmixl_mainbus.c rmixl_nand.c rmixl_obio.c rmixl_obio_eb_space.c
rmixl_obio_el_space.c rmixl_ohci.c rmixl_pci_cfg_space.c
rmixl_pci_ecfg_space.c rmixl_pci_io_space.c rmixl_pci_mem_space.c
rmixl_pcie.c rmixl_pcix.c rmixl_usbi.c rmixlvar.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_com.c \
src/sys/arch/mips/rmi/rmixl_usbi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/rmi/rmixl_cpunode.c \
src/sys/arch/mips/rmi/rmixl_iobus.c \
src/sys/arch/mips/rmi/rmixl_iobus_space.c \
src/sys/arch/mips/rmi/rmixl_obio_eb_space.c \
src/sys/arch/mips/rmi/rmixl_obio_el_space.c \
src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c \
src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c \
src/sys/arch/mips/rmi/rmixl_pci_io_space.c \
src/sys/arch/mips/rmi/rmixl_pci_mem_space.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_ehci.c \
src/sys/arch/mips/rmi/rmixl_mainbus.c src/sys/arch/mips/rmi/rmixl_obio.c \
src/sys/arch/mips/rmi/rmixl_ohci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/rmi/rmixl_gpio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_intr.c \
src/sys/arch/mips/rmi/rmixlvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixl_nand.c \
src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_pcix.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/mips/rmi/rmixl_com.c
diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.4 src/sys/arch/mips/rmi/rmixl_com.c:1.5
--- src/sys/arch/mips/rmi/rmixl_com.c:1.4 Wed May 11 00:38:03 2011
+++ src/sys/arch/mips/rmi/rmixl_com.c Fri Jul 1 19:01:30 2011
@@ -1,4 +1,4 @@
-/* $Id: rmixl_com.c,v 1.4 2011/05/11 00:38:03 cliff Exp $ */
+/* $Id: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.4 2011/05/11 00:38:03 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@
#include <sys/ttydefaults.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.4 src/sys/arch/mips/rmi/rmixl_usbi.c:1.5
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.4 Fri Apr 29 21:54:14 2011
+++ src/sys/arch/mips/rmi/rmixl_usbi.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbi.c,v 1.4 2011/04/29 21:54:14 matt Exp $ */
+/* $NetBSD: rmixl_usbi.c,v 1.5 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.4 2011/04/29 21:54:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.5 2011/07/01 19:01:31 dyoung Exp $");
#include "locators.h"
@@ -38,7 +38,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_cpunode.c
diff -u src/sys/arch/mips/rmi/rmixl_cpunode.c:1.2 src/sys/arch/mips/rmi/rmixl_cpunode.c:1.3
--- src/sys/arch/mips/rmi/rmixl_cpunode.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_cpunode.c Fri Jul 1 19:01:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpunode.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_cpunode.c,v 1.3 2011/07/01 19:01:30 dyoung Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpunode.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpunode.c,v 1.3 2011/07/01 19:01:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@
#include <mips/rmi/rmixlvar.h>
#include <mips/rmi/rmixl_cpunodevar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
static int cpunode_rmixl_match(device_t, cfdata_t, void *);
Index: src/sys/arch/mips/rmi/rmixl_iobus.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.2 src/sys/arch/mips/rmi/rmixl_iobus.c:1.3
--- src/sys/arch/mips/rmi/rmixl_iobus.c:1.2 Fri Mar 18 01:21:34 2011
+++ src/sys/arch/mips/rmi/rmixl_iobus.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobus.c,v 1.2 2011/03/18 01:21:34 cliff Exp $ */
+/* $NetBSD: rmixl_iobus.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.2 2011/03/18 01:21:34 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include "locators.h"
@@ -55,7 +55,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_iobus_space.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus_space.c:1.2 src/sys/arch/mips/rmi/rmixl_iobus_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_iobus_space.c:1.2 Fri Mar 18 07:12:29 2011
+++ src/sys/arch/mips/rmi/rmixl_iobus_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobus_space.c,v 1.2 2011/03/18 07:12:29 cliff Exp $ */
+/* $NetBSD: rmixl_iobus_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus_space.c,v 1.2 2011/03/18 07:12:29 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_iobusvar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_obio_eb_space.c
diff -u src/sys/arch/mips/rmi/rmixl_obio_eb_space.c:1.2 src/sys/arch/mips/rmi/rmixl_obio_eb_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_obio_eb_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_obio_eb_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio_eb_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_obio_eb_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_eb_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_eb_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_obio_el_space.c
diff -u src/sys/arch/mips/rmi/rmixl_obio_el_space.c:1.2 src/sys/arch/mips/rmi/rmixl_obio_el_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_obio_el_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_obio_el_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio_el_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_obio_el_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_el_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_el_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c:1.2 src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pci_cfg_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_pci_cfg_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,12 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_cfg_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_cfg_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c:1.2 src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pci_ecfg_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_pci_ecfg_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,12 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_ecfg_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_ecfg_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pci_io_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pci_io_space.c:1.2 src/sys/arch/mips/rmi/rmixl_pci_io_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_pci_io_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_pci_io_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pci_io_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_pci_io_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,12 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_io_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_io_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pci_mem_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pci_mem_space.c:1.2 src/sys/arch/mips/rmi/rmixl_pci_mem_space.c:1.3
--- src/sys/arch/mips/rmi/rmixl_pci_mem_space.c:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_pci_mem_space.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pci_mem_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_pci_mem_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,12 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_mem_space.c,v 1.2 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pci_mem_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_ehci.c
diff -u src/sys/arch/mips/rmi/rmixl_ehci.c:1.3 src/sys/arch/mips/rmi/rmixl_ehci.c:1.4
--- src/sys/arch/mips/rmi/rmixl_ehci.c:1.3 Fri Apr 29 21:54:14 2011
+++ src/sys/arch/mips/rmi/rmixl_ehci.c Fri Jul 1 19:01:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ehci.c,v 1.3 2011/04/29 21:54:14 matt Exp $ */
+/* $NetBSD: rmixl_ehci.c,v 1.4 2011/07/01 19:01:30 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.3 2011/04/29 21:54:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.4 2011/07/01 19:01:30 dyoung Exp $");
#include "locators.h"
@@ -38,7 +38,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.3 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.3 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_mainbus.c,v 1.3 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_mainbus.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.3 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <sys/device.h>
#include <evbmips/rmixl/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
static int mainbusmatch(device_t, cfdata_t, void *);
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.3 src/sys/arch/mips/rmi/rmixl_obio.c:1.4
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.3 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_obio.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.3 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.3 2011/02/20 07:48:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $");
#include "locators.h"
#include "pci.h"
@@ -52,7 +52,7 @@
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/int_fmtio.h>
Index: src/sys/arch/mips/rmi/rmixl_ohci.c
diff -u src/sys/arch/mips/rmi/rmixl_ohci.c:1.3 src/sys/arch/mips/rmi/rmixl_ohci.c:1.4
--- src/sys/arch/mips/rmi/rmixl_ohci.c:1.3 Fri Apr 29 21:54:14 2011
+++ src/sys/arch/mips/rmi/rmixl_ohci.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ohci.c,v 1.3 2011/04/29 21:54:14 matt Exp $ */
+/* $NetBSD: rmixl_ohci.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,13 +32,13 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.3 2011/04/29 21:54:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_gpio.c
diff -u src/sys/arch/mips/rmi/rmixl_gpio.c:1.1 src/sys/arch/mips/rmi/rmixl_gpio.c:1.2
--- src/sys/arch/mips/rmi/rmixl_gpio.c:1.1 Fri Mar 18 01:03:10 2011
+++ src/sys/arch/mips/rmi/rmixl_gpio.c Fri Jul 1 19:01:30 2011
@@ -1,5 +1,5 @@
-/* $NetBSD: rmixl_gpio.c,v 1.1 2011/03/18 01:03:10 cliff Exp $ */
-/* $NetBSD: rmixl_gpio.c,v 1.1 2011/03/18 01:03:10 cliff Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $ */
+/* $NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.1 2011/03/18 01:03:10 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c,v 1.2 2011/07/01 19:01:30 dyoung Exp $");
#define _INTR_PRIVATE
@@ -46,7 +46,7 @@
#include <mips/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.5 src/sys/arch/mips/rmi/rmixl_intr.c:1.6
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.5 Fri Apr 29 21:58:27 2011
+++ src/sys/arch/mips/rmi/rmixl_intr.c Fri Jul 1 19:01:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.5 2011/04/29 21:58:27 matt Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.6 2011/07/01 19:01:30 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.5 2011/04/29 21:58:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.6 2011/07/01 19:01:30 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -80,7 +80,7 @@
#include <sys/mutex.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/cpu.h>
Index: src/sys/arch/mips/rmi/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.5 src/sys/arch/mips/rmi/rmixlvar.h:1.6
--- src/sys/arch/mips/rmi/rmixlvar.h:1.5 Thu Apr 14 05:21:22 2011
+++ src/sys/arch/mips/rmi/rmixlvar.h Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.5 2011/04/14 05:21:22 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.6 2011/07/01 19:01:31 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
#include <mips/locore.h>
#include <mips/rmi/rmixl_firmware.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/mips/rmi/rmixl_nand.c
diff -u src/sys/arch/mips/rmi/rmixl_nand.c:1.6 src/sys/arch/mips/rmi/rmixl_nand.c:1.7
--- src/sys/arch/mips/rmi/rmixl_nand.c:1.6 Tue Jun 28 07:17:31 2011
+++ src/sys/arch/mips/rmi/rmixl_nand.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_nand.c,v 1.6 2011/06/28 07:17:31 ahoka Exp $ */
+/* $NetBSD: rmixl_nand.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_nand.c,v 1.6 2011/06/28 07:17:31 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_nand.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $");
#include "opt_flash.h"
@@ -46,7 +46,7 @@
#include <sys/device.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.6 src/sys/arch/mips/rmi/rmixl_pcie.c:1.7
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.6 Tue May 17 17:34:51 2011
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.6 2011/05/17 17:34:51 dyoung Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.6 2011/05/17 17:34:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.7 2011/07/01 19:01:31 dyoung Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -57,7 +57,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/rmi/rmixlreg.h>
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.7 src/sys/arch/mips/rmi/rmixl_pcix.c:1.8
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.7 Tue May 17 17:34:51 2011
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Fri Jul 1 19:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.7 2011/05/17 17:34:51 dyoung Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.8 2011/07/01 19:01:31 dyoung Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.7 2011/05/17 17:34:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.8 2011/07/01 19:01:31 dyoung Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -57,7 +57,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/rmi/rmixlreg.h>
