Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:38:49 UTC 2011
Modified Files:
src/sys/arch/mips/adm5120: adm5120_cfio.c adm5120_extio.c
adm5120_extio_space.c adm5120_intr.c adm5120_obio.c
adm5120_obio_dma.c adm5120_obio_space.c adm5120_pciio_space.c
adm5120_pcimem_space.c
src/sys/arch/mips/adm5120/dev: admgpio.c admpci.c admwdog.c ahci.c
if_admsw.c if_admswvar.h uart.c wdc_extio.c
src/sys/arch/mips/adm5120/include: adm5120var.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/adm5120_cfio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_extio.c \
src/sys/arch/mips/adm5120/adm5120_intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/adm5120/adm5120_extio_space.c \
src/sys/arch/mips/adm5120/adm5120_obio.c \
src/sys/arch/mips/adm5120/adm5120_obio_dma.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_obio_space.c \
src/sys/arch/mips/adm5120/adm5120_pciio_space.c \
src/sys/arch/mips/adm5120/adm5120_pcimem_space.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/adm5120/dev/admgpio.c \
src/sys/arch/mips/adm5120/dev/wdc_extio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/adm5120/dev/admpci.c \
src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/admwdog.c \
src/sys/arch/mips/adm5120/dev/if_admswvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/if_admsw.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/adm5120/dev/uart.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/include/adm5120var.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/adm5120/adm5120_cfio.c
diff -u src/sys/arch/mips/adm5120/adm5120_cfio.c:1.1 src/sys/arch/mips/adm5120/adm5120_cfio.c:1.2
--- src/sys/arch/mips/adm5120/adm5120_cfio.c:1.1 Tue Mar 20 08:52:04 2007
+++ src/sys/arch/mips/adm5120/adm5120_cfio.c Fri Jul 1 18:38:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $ */
+/* $NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -30,13 +30,13 @@
* OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: src/sys/arch/mips/adm5120/adm5120_extio.c
diff -u src/sys/arch/mips/adm5120/adm5120_extio.c:1.4 src/sys/arch/mips/adm5120/adm5120_extio.c:1.5
--- src/sys/arch/mips/adm5120/adm5120_extio.c:1.4 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/mips/adm5120/adm5120_extio.c Fri Jul 1 18:38:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -65,13 +65,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: src/sys/arch/mips/adm5120/adm5120_intr.c
diff -u src/sys/arch/mips/adm5120/adm5120_intr.c:1.4 src/sys/arch/mips/adm5120/adm5120_intr.c:1.5
--- src/sys/arch/mips/adm5120/adm5120_intr.c:1.4 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/mips/adm5120/adm5120_intr.c Fri Jul 1 18:38:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -79,7 +79,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/adm5120/adm5120_extio_space.c
diff -u src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.3 src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.4
--- src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.3 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/mips/adm5120/adm5120_extio_space.c Fri Jul 1 18:38:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -60,11 +60,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_extiovar.h>
Index: src/sys/arch/mips/adm5120/adm5120_obio.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio.c:1.3 src/sys/arch/mips/adm5120/adm5120_obio.c:1.4
--- src/sys/arch/mips/adm5120/adm5120_obio.c:1.3 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/mips/adm5120/adm5120_obio.c Fri Jul 1 18:38:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,13 +66,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: src/sys/arch/mips/adm5120/adm5120_obio_dma.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.3 src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.4
--- src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.3 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/mips/adm5120/adm5120_obio_dma.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,12 +64,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
Index: src/sys/arch/mips/adm5120/adm5120_obio_space.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio_space.c:1.2 src/sys/arch/mips/adm5120/adm5120_obio_space.c:1.3
--- src/sys/arch/mips/adm5120/adm5120_obio_space.c:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/adm5120_obio_space.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,11 +64,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
#define CHIP obio
Index: src/sys/arch/mips/adm5120/adm5120_pciio_space.c
diff -u src/sys/arch/mips/adm5120/adm5120_pciio_space.c:1.2 src/sys/arch/mips/adm5120/adm5120_pciio_space.c:1.3
--- src/sys/arch/mips/adm5120/adm5120_pciio_space.c:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/adm5120_pciio_space.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_pcivar.h>
Index: src/sys/arch/mips/adm5120/adm5120_pcimem_space.c
diff -u src/sys/arch/mips/adm5120/adm5120_pcimem_space.c:1.2 src/sys/arch/mips/adm5120/adm5120_pcimem_space.c:1.3
--- src/sys/arch/mips/adm5120/adm5120_pcimem_space.c:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/adm5120_pcimem_space.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_pcivar.h>
Index: src/sys/arch/mips/adm5120/dev/admgpio.c
diff -u src/sys/arch/mips/adm5120/dev/admgpio.c:1.3 src/sys/arch/mips/adm5120/dev/admgpio.c:1.4
--- src/sys/arch/mips/adm5120/dev/admgpio.c:1.3 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/mips/adm5120/dev/admgpio.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/gpio.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/gpio/gpiovar.h>
Index: src/sys/arch/mips/adm5120/dev/wdc_extio.c
diff -u src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.3 src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.4
--- src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.3 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/mips/adm5120/dev/wdc_extio.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -71,7 +71,7 @@
#include <sys/kernel.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/cpu.h>
Index: src/sys/arch/mips/adm5120/dev/admpci.c
diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.6 src/sys/arch/mips/adm5120/dev/admpci.c:1.7
--- src/sys/arch/mips/adm5120/dev/admpci.c:1.6 Tue May 17 17:34:50 2011
+++ src/sys/arch/mips/adm5120/dev/admpci.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $ */
+/* $NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -61,7 +61,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -74,7 +74,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/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.6 src/sys/arch/mips/adm5120/dev/ahci.c:1.7
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.6 Mon Apr 4 19:58:56 2011
+++ src/sys/arch/mips/adm5120/dev/ahci.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $ */
+/* $NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/usb/usb.h>
Index: src/sys/arch/mips/adm5120/dev/admwdog.c
diff -u src/sys/arch/mips/adm5120/dev/admwdog.c:1.2 src/sys/arch/mips/adm5120/dev/admwdog.c:1.3
--- src/sys/arch/mips/adm5120/dev/admwdog.c:1.2 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/mips/adm5120/dev/admwdog.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/wdog.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
Index: src/sys/arch/mips/adm5120/dev/if_admswvar.h
diff -u src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.2 src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.3
--- src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.2 Tue Jan 19 22:06:21 2010
+++ src/sys/arch/mips/adm5120/dev/if_admswvar.h Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -34,7 +34,7 @@
#define _IF_ADMSWVAR_H_
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.8 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.9
--- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.8 Mon Apr 5 07:19:30 2010
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $ */
+/* $NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/param.h>
@@ -102,7 +102,7 @@
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: src/sys/arch/mips/adm5120/dev/uart.c
diff -u src/sys/arch/mips/adm5120/dev/uart.c:1.7 src/sys/arch/mips/adm5120/dev/uart.c:1.8
--- src/sys/arch/mips/adm5120/dev/uart.c:1.7 Sun Apr 24 16:26:56 2011
+++ src/sys/arch/mips/adm5120/dev/uart.c Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $ */
+/* $NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,7 +51,7 @@
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120var.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
Index: src/sys/arch/mips/adm5120/include/adm5120var.h
diff -u src/sys/arch/mips/adm5120/include/adm5120var.h:1.2 src/sys/arch/mips/adm5120/include/adm5120var.h:1.3
--- src/sys/arch/mips/adm5120/include/adm5120var.h:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/include/adm5120var.h Fri Jul 1 18:38:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120var.h,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120var.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -62,7 +62,7 @@
#ifndef _ADM5120VAR_H_
#define _ADM5120VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#if 0
#include <sys/socket.h>
