Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:32:28 UTC 2011
Modified Files:
src/sys/arch/arm/footbridge: footbridge.c footbridge.h footbridge_com.c
footbridge_com_io.c footbridge_io.c footbridge_pci.c
footbridgevar.h
src/sys/arch/arm/footbridge/isa: isa_io.c isa_machdep.c
isadma_machdep.c isapnp_machdep.c
src/sys/arch/arm/gemini: gemini_a4x_space.c gemini_com.c gemini_dma.c
gemini_gmac.c gemini_gpio.c gemini_icu.c gemini_lpchc.c
gemini_lpchcvar.h gemini_lpcvar.h gemini_obio.c gemini_pci.c
gemini_space.c gemini_timer.c gemini_var.h gemini_wdt.c
gemini_wdtvar.h if_gmc.c if_gpn.c lpc_com.c obio_lpchc.c
obio_timer.c obio_wdc.c obio_wdt.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/footbridge/footbridge.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/footbridge/footbridge.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/footbridge/footbridge_com.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/footbridge/footbridge_com_io.c \
src/sys/arch/arm/footbridge/footbridgevar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/footbridge/footbridge_io.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/footbridge/isa/isa_io.c \
src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/footbridge/isa/isa_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/footbridge/isa/isadma_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/gemini/gemini_a4x_space.c \
src/sys/arch/arm/gemini/gemini_dma.c \
src/sys/arch/arm/gemini/gemini_lpchc.c \
src/sys/arch/arm/gemini/gemini_var.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/gemini/gemini_com.c \
src/sys/arch/arm/gemini/gemini_gpio.c \
src/sys/arch/arm/gemini/gemini_lpcvar.h \
src/sys/arch/arm/gemini/gemini_space.c \
src/sys/arch/arm/gemini/gemini_wdt.c src/sys/arch/arm/gemini/obio_lpchc.c \
src/sys/arch/arm/gemini/obio_wdc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/gemini_icu.c \
src/sys/arch/arm/gemini/gemini_timer.c \
src/sys/arch/arm/gemini/obio_timer.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_lpchcvar.h \
src/sys/arch/arm/gemini/gemini_wdtvar.h src/sys/arch/arm/gemini/if_gmc.c \
src/sys/arch/arm/gemini/if_gpn.c src/sys/arch/arm/gemini/lpc_com.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/gemini/gemini_obio.c \
src/sys/arch/arm/gemini/gemini_pci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/obio_wdt.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/arm/footbridge/footbridge.c
diff -u src/sys/arch/arm/footbridge/footbridge.c:1.24 src/sys/arch/arm/footbridge/footbridge.c:1.25
--- src/sys/arch/arm/footbridge/footbridge.c:1.24 Tue May 17 17:34:47 2011
+++ src/sys/arch/arm/footbridge/footbridge.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge.c,v 1.24 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: footbridge.c,v 1.25 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.24 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.25 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <dev/pci/pcivar.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
Index: src/sys/arch/arm/footbridge/footbridge.h
diff -u src/sys/arch/arm/footbridge/footbridge.h:1.3 src/sys/arch/arm/footbridge/footbridge.h:1.4
--- src/sys/arch/arm/footbridge/footbridge.h:1.3 Sat Mar 14 14:45:55 2009
+++ src/sys/arch/arm/footbridge/footbridge.h Fri Jul 1 19:32:28 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: footbridge.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: footbridge.h,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
#ifndef _FOOTBRIDGE_H_
#define _FOOTBRIDGE_H_
#include <sys/termios.h>
-#include <arm/bus.h>
+#include <sys/bus.h>
void footbridge_pci_bs_tag_init(void);
void footbridge_sa110_cc_setup(void);
void footbridge_create_io_bs_tag(struct bus_space *, void *);
Index: src/sys/arch/arm/footbridge/footbridge_com.c
diff -u src/sys/arch/arm/footbridge/footbridge_com.c:1.33 src/sys/arch/arm/footbridge/footbridge_com.c:1.34
--- src/sys/arch/arm/footbridge/footbridge_com.c:1.33 Sun Apr 24 16:26:53 2011
+++ src/sys/arch/arm/footbridge/footbridge_com.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com.c,v 1.33 2011/04/24 16:26:53 rmind Exp $ */
+/* $NetBSD: footbridge_com.c,v 1.34 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 1997 Mark Brinicombe
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.33 2011/04/24 16:26:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.34 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -53,7 +53,7 @@
#include <sys/malloc.h>
#include <sys/termios.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/footbridge/dc21285mem.h>
#include <arm/footbridge/dc21285reg.h>
Index: src/sys/arch/arm/footbridge/footbridge_com_io.c
diff -u src/sys/arch/arm/footbridge/footbridge_com_io.c:1.6 src/sys/arch/arm/footbridge/footbridge_com_io.c:1.7
--- src/sys/arch/arm/footbridge/footbridge_com_io.c:1.6 Sat Mar 14 21:04:05 2009
+++ src/sys/arch/arm/footbridge/footbridge_com_io.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com_io.c,v 1.6 2009/03/14 21:04:05 dsl Exp $ */
+/* $NetBSD: footbridge_com_io.c,v 1.7 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -43,11 +43,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com_io.c,v 1.6 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com_io.c,v 1.7 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/arm/footbridge/footbridgevar.h
diff -u src/sys/arch/arm/footbridge/footbridgevar.h:1.6 src/sys/arch/arm/footbridge/footbridgevar.h:1.7
--- src/sys/arch/arm/footbridge/footbridgevar.h:1.6 Tue Jul 21 07:35:55 2009
+++ src/sys/arch/arm/footbridge/footbridgevar.h Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridgevar.h,v 1.6 2009/07/21 07:35:55 skrll Exp $ */
+/* $NetBSD: footbridgevar.h,v 1.7 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rtc.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/arm/footbridge/footbridge_io.c
diff -u src/sys/arch/arm/footbridge/footbridge_io.c:1.19 src/sys/arch/arm/footbridge/footbridge_io.c:1.20
--- src/sys/arch/arm/footbridge/footbridge_io.c:1.19 Mon Nov 22 07:27:28 2010
+++ src/sys/arch/arm/footbridge/footbridge_io.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_io.c,v 1.19 2010/11/22 07:27:28 skrll Exp $ */
+/* $NetBSD: footbridge_io.c,v 1.20 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 1997 Causality Limited
@@ -39,11 +39,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.19 2010/11/22 07:27:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.20 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/footbridge/footbridge.h>
#include <arm/footbridge/dc21285mem.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/footbridge/footbridge_pci.c
diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.20 src/sys/arch/arm/footbridge/footbridge_pci.c:1.21
--- src/sys/arch/arm/footbridge/footbridge_pci.c:1.20 Thu Jun 30 20:09:20 2011
+++ src/sys/arch/arm/footbridge/footbridge_pci.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.20 2011/06/30 20:09:20 wiz Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.21 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.20 2011/06/30 20:09:20 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.21 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/arm/footbridge/isa/isa_io.c
diff -u src/sys/arch/arm/footbridge/isa/isa_io.c:1.5 src/sys/arch/arm/footbridge/isa/isa_io.c:1.6
--- src/sys/arch/arm/footbridge/isa/isa_io.c:1.5 Sat Mar 14 21:04:05 2009
+++ src/sys/arch/arm/footbridge/isa/isa_io.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.5 2009/03/14 21:04:05 dsl Exp $ */
+/* $NetBSD: isa_io.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright 1997
@@ -38,11 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.5 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
Index: src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.5 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.6
--- src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.5 Wed Oct 21 21:57:39 2009
+++ src/sys/arch/arm/footbridge/isa/isapnp_machdep.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -73,14 +73,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.17 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.18
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.17 Sun Jun 13 02:11:22 2010
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.17 2010/06/13 02:11:22 tsutsui Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.18 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.17 2010/06/13 02:11:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_irqstats.h"
@@ -78,7 +78,7 @@
#include <sys/proc.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: src/sys/arch/arm/footbridge/isa/isadma_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isadma_machdep.c:1.13 src/sys/arch/arm/footbridge/isa/isadma_machdep.c:1.14
--- src/sys/arch/arm/footbridge/isa/isadma_machdep.c:1.13 Wed Mar 18 10:22:23 2009
+++ src/sys/arch/arm/footbridge/isa/isadma_machdep.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.13 2009/03/18 10:22:23 cegger Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.14 2011/07/01 19:32:28 dyoung Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.13 2009/03/18 10:22:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.14 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <sys/mbuf.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arm/gemini/gemini_a4x_space.c
diff -u src/sys/arch/arm/gemini/gemini_a4x_space.c:1.1 src/sys/arch/arm/gemini/gemini_a4x_space.c:1.2
--- src/sys/arch/arm/gemini/gemini_a4x_space.c:1.1 Fri Oct 24 04:23:18 2008
+++ src/sys/arch/arm/gemini/gemini_a4x_space.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_a4x_space.c,v 1.1 2008/10/24 04:23:18 matt Exp $ */
+/* $NetBSD: gemini_a4x_space.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp
@@ -43,14 +43,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_a4x_space.c,v 1.1 2008/10/24 04:23:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_a4x_space.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(gemini);
Index: src/sys/arch/arm/gemini/gemini_dma.c
diff -u src/sys/arch/arm/gemini/gemini_dma.c:1.1 src/sys/arch/arm/gemini/gemini_dma.c:1.2
--- src/sys/arch/arm/gemini/gemini_dma.c:1.1 Fri Oct 24 04:23:18 2008
+++ src/sys/arch/arm/gemini/gemini_dma.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_dma.c,v 1.1 2008/10/24 04:23:18 matt Exp $ */
+/* $NetBSD: gemini_dma.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: pxa2x0_dma.c,v 1.4 2005/12/11 12:16:51 christos Exp
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_dma.c,v 1.1 2008/10/24 04:23:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_dma.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag gemini_bus_dma_tag = {
0,
Index: src/sys/arch/arm/gemini/gemini_lpchc.c
diff -u src/sys/arch/arm/gemini/gemini_lpchc.c:1.1 src/sys/arch/arm/gemini/gemini_lpchc.c:1.2
--- src/sys/arch/arm/gemini/gemini_lpchc.c:1.1 Sun Nov 9 09:15:42 2008
+++ src/sys/arch/arm/gemini/gemini_lpchc.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_lpchc.c,v 1.1 2008/11/09 09:15:42 cliff Exp $ */
+/* $NetBSD: gemini_lpchc.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $ */
/*
* GEMINI LPC Host Controller
@@ -7,7 +7,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_lpchc.c,v 1.1 2008/11/09 09:15:42 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_lpchc.c,v 1.2 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -18,7 +18,7 @@
#include <sys/malloc.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_lpchcvar.h>
#include <arm/gemini/gemini_lpcvar.h>
Index: src/sys/arch/arm/gemini/gemini_var.h
diff -u src/sys/arch/arm/gemini/gemini_var.h:1.1 src/sys/arch/arm/gemini/gemini_var.h:1.2
--- src/sys/arch/arm/gemini/gemini_var.h:1.1 Fri Oct 24 04:23:18 2008
+++ src/sys/arch/arm/gemini/gemini_var.h Fri Jul 1 19:32:28 2011
@@ -2,7 +2,7 @@
#define _ARM_GEMINI_VAR_H_
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* GEMINI generic */
Index: src/sys/arch/arm/gemini/gemini_com.c
diff -u src/sys/arch/arm/gemini/gemini_com.c:1.2 src/sys/arch/arm/gemini/gemini_com.c:1.3
--- src/sys/arch/arm/gemini/gemini_com.c:1.2 Sat Nov 8 09:39:27 2008
+++ src/sys/arch/arm/gemini/gemini_com.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_com.c,v 1.2 2008/11/08 09:39:27 cliff Exp $ */
+/* $NetBSD: gemini_com.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: omap_com.c,v 1.2 2008/03/14 15:09:09 cube Exp
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_com.c,v 1.2 2008/11/08 09:39:27 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_com.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_com.h"
@@ -52,7 +52,7 @@
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/pic/picvar.h>
Index: src/sys/arch/arm/gemini/gemini_gpio.c
diff -u src/sys/arch/arm/gemini/gemini_gpio.c:1.2 src/sys/arch/arm/gemini/gemini_gpio.c:1.3
--- src/sys/arch/arm/gemini/gemini_gpio.c:1.2 Sun Dec 14 01:55:15 2008
+++ src/sys/arch/arm/gemini/gemini_gpio.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gpio.c,v 1.2 2008/12/14 01:55:15 matt Exp $ */
+/* $NetBSD: gemini_gpio.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from
* $NetBSD: omap2_gpio.c,v 1.6 2008/11/19 06:26:27 matt Exp
@@ -33,7 +33,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_gpio.c,v 1.2 2008/12/14 01:55:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gpio.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
#define _INTR_PRIVATE
@@ -54,7 +54,7 @@
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_reg.h>
#include <arm/gemini/gemini_obiovar.h>
Index: src/sys/arch/arm/gemini/gemini_lpcvar.h
diff -u src/sys/arch/arm/gemini/gemini_lpcvar.h:1.2 src/sys/arch/arm/gemini/gemini_lpcvar.h:1.3
--- src/sys/arch/arm/gemini/gemini_lpcvar.h:1.2 Sat Nov 15 05:48:34 2008
+++ src/sys/arch/arm/gemini/gemini_lpcvar.h Fri Jul 1 19:32:28 2011
@@ -1,11 +1,11 @@
-/* $NetBSD: gemini_lpcvar.h,v 1.2 2008/11/15 05:48:34 cliff Exp $ */
+/* $NetBSD: gemini_lpcvar.h,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
#ifndef _ARM_GEMINI_LPCVAR_H
#define _ARM_GEMINI_LPCVAR_H
#include <sys/types.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#define GEMINI_LPC_LDN_ALL -1 /* "global" LDN */
Index: src/sys/arch/arm/gemini/gemini_space.c
diff -u src/sys/arch/arm/gemini/gemini_space.c:1.2 src/sys/arch/arm/gemini/gemini_space.c:1.3
--- src/sys/arch/arm/gemini/gemini_space.c:1.2 Sat Nov 7 07:27:41 2009
+++ src/sys/arch/arm/gemini/gemini_space.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_space.c,v 1.2 2009/11/07 07:27:41 cegger Exp $ */
+/* $NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: pxa2x0_space.c,v 1.8 2005/11/24 13:08:32 yamt Exp
@@ -79,14 +79,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.2 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(gemini);
Index: src/sys/arch/arm/gemini/gemini_wdt.c
diff -u src/sys/arch/arm/gemini/gemini_wdt.c:1.2 src/sys/arch/arm/gemini/gemini_wdt.c:1.3
--- src/sys/arch/arm/gemini/gemini_wdt.c:1.2 Sat Nov 1 07:43:19 2008
+++ src/sys/arch/arm/gemini/gemini_wdt.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_wdt.c,v 1.2 2008/11/01 07:43:19 cliff Exp $ */
+/* $NetBSD: gemini_wdt.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/*
* OMAP watchdog timers, common code
@@ -42,7 +42,7 @@
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/gemini/gemini_wdtvar.h>
Index: src/sys/arch/arm/gemini/obio_lpchc.c
diff -u src/sys/arch/arm/gemini/obio_lpchc.c:1.2 src/sys/arch/arm/gemini/obio_lpchc.c:1.3
--- src/sys/arch/arm/gemini/obio_lpchc.c:1.2 Thu Nov 20 20:23:05 2008
+++ src/sys/arch/arm/gemini/obio_lpchc.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_lpchc.c,v 1.2 2008/11/20 20:23:05 cliff Exp $ */
+/* $NetBSD: obio_lpchc.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/*
* obio attachment for GEMINI LPC Host Controller
@@ -7,7 +7,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_lpchc.c,v 1.2 2008/11/20 20:23:05 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_lpchc.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -17,7 +17,7 @@
#include <sys/systm.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_obiovar.h>
#include <arm/gemini/gemini_lpcvar.h>
Index: src/sys/arch/arm/gemini/obio_wdc.c
diff -u src/sys/arch/arm/gemini/obio_wdc.c:1.2 src/sys/arch/arm/gemini/obio_wdc.c:1.3
--- src/sys/arch/arm/gemini/obio_wdc.c:1.2 Mon Nov 17 23:51:30 2008
+++ src/sys/arch/arm/gemini/obio_wdc.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_wdc.c,v 1.2 2008/11/17 23:51:30 cliff Exp $ */
+/* $NetBSD: obio_wdc.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from iq31244/wdc_obio.c:
* NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_wdc.c,v 1.2 2008/11/17 23:51:30 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_wdc.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
#include "locators.h"
@@ -43,7 +43,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_var.h>
Index: src/sys/arch/arm/gemini/gemini_gmac.c
diff -u src/sys/arch/arm/gemini/gemini_gmac.c:1.6 src/sys/arch/arm/gemini/gemini_gmac.c:1.7
--- src/sys/arch/arm/gemini/gemini_gmac.c:1.6 Mon Apr 5 07:19:29 2010
+++ src/sys/arch/arm/gemini/gemini_gmac.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.6 2010/04/05 07:19:29 joerg Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.7 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_reg.h>
#include <arm/gemini/gemini_obiovar.h>
@@ -49,7 +49,7 @@
#include <sys/gpio.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.6 2010/04/05 07:19:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.7 2011/07/01 19:32:28 dyoung Exp $");
#define SWFREEQ_DESCS 256 /* one page worth */
#define HWFREEQ_DESCS 256 /* one page worth */
Index: src/sys/arch/arm/gemini/gemini_icu.c
diff -u src/sys/arch/arm/gemini/gemini_icu.c:1.4 src/sys/arch/arm/gemini/gemini_icu.c:1.5
--- src/sys/arch/arm/gemini/gemini_icu.c:1.4 Mon Dec 20 00:25:27 2010
+++ src/sys/arch/arm/gemini/gemini_icu.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_icu.c,v 1.4 2010/12/20 00:25:27 matt Exp $ */
+/* $NetBSD: gemini_icu.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: omap2_icu.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -36,7 +36,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.4 2010/12/20 00:25:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -44,7 +44,7 @@
#include <uvm/uvm_extern.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: src/sys/arch/arm/gemini/gemini_timer.c
diff -u src/sys/arch/arm/gemini/gemini_timer.c:1.4 src/sys/arch/arm/gemini/gemini_timer.c:1.5
--- src/sys/arch/arm/gemini/gemini_timer.c:1.4 Tue Jan 5 13:14:56 2010
+++ src/sys/arch/arm/gemini/gemini_timer.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_timer.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $ */
+/* $NetBSD: gemini_timer.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: omap2_geminitmr.c,v 1.1 2008/08/27 11:03:10 matt Exp
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_gemini.h"
#include "opt_cpuoptions.h"
@@ -96,7 +96,7 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/gemini/obio_timer.c
diff -u src/sys/arch/arm/gemini/obio_timer.c:1.4 src/sys/arch/arm/gemini/obio_timer.c:1.5
--- src/sys/arch/arm/gemini/obio_timer.c:1.4 Thu Dec 4 00:38:07 2008
+++ src/sys/arch/arm/gemini/obio_timer.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_timer.c,v 1.4 2008/12/04 00:38:07 cliff Exp $ */
+/* $NetBSD: obio_timer.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: obio_mputmr.c,v 1.3 2008/08/27 11:03:10 matt Exp
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_timer.c,v 1.4 2008/12/04 00:38:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_timer.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_cpuoptions.h"
#include "opt_gemini.h"
@@ -120,7 +120,7 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_reg.h>
Index: src/sys/arch/arm/gemini/gemini_lpchcvar.h
diff -u src/sys/arch/arm/gemini/gemini_lpchcvar.h:1.3 src/sys/arch/arm/gemini/gemini_lpchcvar.h:1.4
--- src/sys/arch/arm/gemini/gemini_lpchcvar.h:1.3 Thu Nov 20 20:23:04 2008
+++ src/sys/arch/arm/gemini/gemini_lpchcvar.h Fri Jul 1 19:32:28 2011
@@ -1,11 +1,11 @@
-/* $NetBSD: gemini_lpchcvar.h,v 1.3 2008/11/20 20:23:04 cliff Exp $ */
+/* $NetBSD: gemini_lpchcvar.h,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
#ifndef _ARM_GEMINI_LPHCVAR_H
#define _ARM_GEMINI_LPHCVAR_H
#include <sys/types.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/arm/gemini/gemini_lpcvar.h>
Index: src/sys/arch/arm/gemini/gemini_wdtvar.h
diff -u src/sys/arch/arm/gemini/gemini_wdtvar.h:1.3 src/sys/arch/arm/gemini/gemini_wdtvar.h:1.4
--- src/sys/arch/arm/gemini/gemini_wdtvar.h:1.3 Thu Nov 20 20:23:05 2008
+++ src/sys/arch/arm/gemini/gemini_wdtvar.h Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_wdtvar.h,v 1.3 2008/11/20 20:23:05 cliff Exp $ */
+/* $NetBSD: gemini_wdtvar.h,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
/*
* adapted/extracted from omap_wdt.c
@@ -34,7 +34,7 @@
#define _ARM_GEMINI_WDTVAR_H
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
typedef struct geminiwdt_softc {
Index: src/sys/arch/arm/gemini/if_gmc.c
diff -u src/sys/arch/arm/gemini/if_gmc.c:1.3 src/sys/arch/arm/gemini/if_gmc.c:1.4
--- src/sys/arch/arm/gemini/if_gmc.c:1.3 Tue Dec 23 02:15:11 2008
+++ src/sys/arch/arm/gemini/if_gmc.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gmc.c,v 1.3 2008/12/23 02:15:11 matt Exp $ */
+/* $NetBSD: if_gmc.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/kmem.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_reg.h>
@@ -47,7 +47,7 @@
#include <net/if_ether.h>
#include <net/if_dl.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.3 2008/12/23 02:15:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $");
#define MAX_TXSEG 32
Index: src/sys/arch/arm/gemini/if_gpn.c
diff -u src/sys/arch/arm/gemini/if_gpn.c:1.3 src/sys/arch/arm/gemini/if_gpn.c:1.4
--- src/sys/arch/arm/gemini/if_gpn.c:1.3 Mon Apr 5 07:19:29 2010
+++ src/sys/arch/arm/gemini/if_gpn.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gpn.c,v 1.3 2010/04/05 07:19:29 joerg Exp $ */
+/* $NetBSD: if_gpn.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
#include "opt_gemini.h"
-__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.3 2010/04/05 07:19:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,7 +46,7 @@
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_var.h>
#include <arm/gemini/gemini_ipm.h>
Index: src/sys/arch/arm/gemini/lpc_com.c
diff -u src/sys/arch/arm/gemini/lpc_com.c:1.3 src/sys/arch/arm/gemini/lpc_com.c:1.4
--- src/sys/arch/arm/gemini/lpc_com.c:1.3 Sat Nov 15 05:48:34 2008
+++ src/sys/arch/arm/gemini/lpc_com.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpc_com.c,v 1.3 2008/11/15 05:48:34 cliff Exp $ */
+/* $NetBSD: lpc_com.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: gemini_com.c,v 1.1 2008/10/24 04:23:18 matt Exp
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpc_com.c,v 1.3 2008/11/15 05:48:34 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpc_com.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $");
#include "opt_com.h"
#include "locators.h"
@@ -55,7 +55,7 @@
#include <sys/kernel.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/arm/gemini/gemini_obio.c
diff -u src/sys/arch/arm/gemini/gemini_obio.c:1.9 src/sys/arch/arm/gemini/gemini_obio.c:1.10
--- src/sys/arch/arm/gemini/gemini_obio.c:1.9 Tue May 17 17:34:48 2011
+++ src/sys/arch/arm/gemini/gemini_obio.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_obio.c,v 1.9 2011/05/17 17:34:48 dyoung Exp $ */
+/* $NetBSD: gemini_obio.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: omap2_obio.c,v 1.5 2008/10/21 18:50:25 matt Exp
@@ -104,7 +104,7 @@
#include "opt_gemini.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.9 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $");
#include "locators.h"
#include "obio.h"
@@ -118,7 +118,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: src/sys/arch/arm/gemini/gemini_pci.c
diff -u src/sys/arch/arm/gemini/gemini_pci.c:1.9 src/sys/arch/arm/gemini/gemini_pci.c:1.10
--- src/sys/arch/arm/gemini/gemini_pci.c:1.9 Mon Apr 4 20:37:45 2011
+++ src/sys/arch/arm/gemini/gemini_pci.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_pci.c,v 1.9 2011/04/04 20:37:45 dyoung Exp $ */
+/* $NetBSD: gemini_pci.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $ */
/* adapted from:
* NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.9 2011/04/04 20:37:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/cdefs.h>
@@ -56,7 +56,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/pic/picvar.h>
Index: src/sys/arch/arm/gemini/obio_wdt.c
diff -u src/sys/arch/arm/gemini/obio_wdt.c:1.5 src/sys/arch/arm/gemini/obio_wdt.c:1.6
--- src/sys/arch/arm/gemini/obio_wdt.c:1.5 Thu Nov 20 20:23:05 2008
+++ src/sys/arch/arm/gemini/obio_wdt.c Fri Jul 1 19:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_wdt.c,v 1.5 2008/11/20 20:23:05 cliff Exp $ */
+/* $NetBSD: obio_wdt.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $ */
/*
* Copyright (c) 2007 Microsoft
@@ -36,7 +36,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.5 2008/11/20 20:23:05 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.6 2011/07/01 19:32:28 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -47,7 +47,7 @@
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/gemini/gemini_obiovar.h>
