Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:31:17 UTC 2011
Modified Files:
src/sys/arch/arm/at91: at91_bus_dma.c at91_bus_space.c at91aic.c
at91bus.c at91busvar.h at91cf.c at91dbgu.c at91emac.c at91ohci.c
at91pdc.c at91pio.c at91pmc.c at91spi.c at91st.c at91tctmr.c
at91twi.c at91usart.c
src/sys/arch/arm/ep93xx: ep93xx_busdma.c ep93xx_intr.c ep93xx_space.c
ep93xxvar.h epclk.c epcom.c epe.c epgpio.c epled.c epohci.c
eppcic.c eprtc.c epsoc.c epsocvar.h epwdog.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91_bus_dma.c \
src/sys/arch/arm/at91/at91_bus_space.c src/sys/arch/arm/at91/at91busvar.h \
src/sys/arch/arm/at91/at91ohci.c src/sys/arch/arm/at91/at91pio.c \
src/sys/arch/arm/at91/at91pmc.c src/sys/arch/arm/at91/at91st.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91aic.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91cf.c \
src/sys/arch/arm/at91/at91pdc.c src/sys/arch/arm/at91/at91spi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/at91/at91dbgu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/at91/at91tctmr.c \
src/sys/arch/arm/at91/at91twi.c src/sys/arch/arm/at91/at91usart.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/ep93xx_busdma.c \
src/sys/arch/arm/ep93xx/ep93xxvar.h src/sys/arch/arm/ep93xx/epgpio.c \
src/sys/arch/arm/ep93xx/epsocvar.h src/sys/arch/arm/ep93xx/epwdog.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ep93xx/ep93xx_intr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/ep93xx_space.c \
src/sys/arch/arm/ep93xx/epohci.c src/sys/arch/arm/ep93xx/eppcic.c \
src/sys/arch/arm/ep93xx/eprtc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ep93xx/epclk.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/ep93xx/epcom.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ep93xx/epled.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ep93xx/epsoc.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/at91/at91_bus_dma.c
diff -u src/sys/arch/arm/at91/at91_bus_dma.c:1.3 src/sys/arch/arm/at91/at91_bus_dma.c:1.4
--- src/sys/arch/arm/at91/at91_bus_dma.c:1.3 Fri Oct 23 00:39:29 2009
+++ src/sys/arch/arm/at91/at91_bus_dma.c Fri Jul 1 19:31:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $ */
+/* $NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -42,7 +42,7 @@
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91var.h>
Index: src/sys/arch/arm/at91/at91_bus_space.c
diff -u src/sys/arch/arm/at91/at91_bus_space.c:1.3 src/sys/arch/arm/at91/at91_bus_space.c:1.4
--- src/sys/arch/arm/at91/at91_bus_space.c:1.3 Fri Oct 23 06:53:12 2009
+++ src/sys/arch/arm/at91/at91_bus_space.c Fri Jul 1 19:31:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
+/* $NetBSD: at91_bus_space.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
/*
* Based on ep93xx_space.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.4 2011/07/01 19:31:16 dyoung Exp $");
/*
* bus_space I/O functions for ep93xx
@@ -43,7 +43,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91var.h>
//#include <arm/ep93xx/ep93xxreg.h>
Index: src/sys/arch/arm/at91/at91busvar.h
diff -u src/sys/arch/arm/at91/at91busvar.h:1.3 src/sys/arch/arm/at91/at91busvar.h:1.4
--- src/sys/arch/arm/at91/at91busvar.h:1.3 Fri Oct 23 06:53:13 2009
+++ src/sys/arch/arm/at91/at91busvar.h Fri Jul 1 19:31:16 2011
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
-/* $NetBSD: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $Id: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
+/* $NetBSD: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -34,7 +34,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91piovar.h>
Index: src/sys/arch/arm/at91/at91ohci.c
diff -u src/sys/arch/arm/at91/at91ohci.c:1.3 src/sys/arch/arm/at91/at91ohci.c:1.4
--- src/sys/arch/arm/at91/at91ohci.c:1.3 Sat Mar 14 15:36:01 2009
+++ src/sys/arch/arm/at91/at91ohci.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91ohci.c,v 1.3 2009/03/14 15:36:01 dsl Exp $ */
-/* $NetBSD: at91ohci.c,v 1.3 2009/03/14 15:36:01 dsl Exp $ */
+/* $Id: at91ohci.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91ohci.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.3 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <sys/mbuf.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: src/sys/arch/arm/at91/at91pio.c
diff -u src/sys/arch/arm/at91/at91pio.c:1.3 src/sys/arch/arm/at91/at91pio.c:1.4
--- src/sys/arch/arm/at91/at91pio.c:1.3 Sat Jun 19 19:47:34 2010
+++ src/sys/arch/arm/at91/at91pio.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
-/* $NetBSD: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
+/* $Id: at91pio.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91pio.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/gpio/gpiovar.h>
#include <arm/at91/at91var.h>
Index: src/sys/arch/arm/at91/at91pmc.c
diff -u src/sys/arch/arm/at91/at91pmc.c:1.3 src/sys/arch/arm/at91/at91pmc.c:1.4
--- src/sys/arch/arm/at91/at91pmc.c:1.3 Fri Oct 23 06:53:13 2009
+++ src/sys/arch/arm/at91/at91pmc.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91pmc.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
-/* $NetBSD: at91pmc.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $Id: at91pmc.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91pmc.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -37,7 +37,7 @@
#include <sys/time.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/at91/at91st.c
diff -u src/sys/arch/arm/at91/at91st.c:1.3 src/sys/arch/arm/at91/at91st.c:1.4
--- src/sys/arch/arm/at91/at91st.c:1.3 Tue Oct 27 03:42:31 2009
+++ src/sys/arch/arm/at91/at91st.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/*$NetBSD: at91st.c,v 1.3 2009/10/27 03:42:31 snj Exp $*/
+/*$NetBSD: at91st.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $*/
/*
* AT91RM9200 clock functions
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91st.c,v 1.3 2009/10/27 03:42:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91st.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,7 +51,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/at91/at91aic.c
diff -u src/sys/arch/arm/at91/at91aic.c:1.6 src/sys/arch/arm/at91/at91aic.c:1.7
--- src/sys/arch/arm/at91/at91aic.c:1.6 Mon Jun 6 16:29:14 2011
+++ src/sys/arch/arm/at91/at91aic.c Fri Jul 1 19:31:16 2011
@@ -1,5 +1,5 @@
-/* $Id: at91aic.c,v 1.6 2011/06/06 16:29:14 matt Exp $ */
-/* $NetBSD: at91aic.c,v 1.6 2011/06/06 16:29:14 matt Exp $ */
+/* $Id: at91aic.c,v 1.7 2011/07/01 19:31:16 dyoung Exp $ */
+/* $NetBSD: at91aic.c,v 1.7 2011/07/01 19:31:16 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -49,7 +49,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.10 src/sys/arch/arm/at91/at91bus.c:1.11
--- src/sys/arch/arm/at91/at91bus.c:1.10 Sat Dec 26 16:01:23 2009
+++ src/sys/arch/arm/at91/at91bus.c Fri Jul 1 19:31:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.10 2009/12/26 16:01:23 uebayasi Exp $ */
+/* $NetBSD: at91bus.c,v 1.11 2011/07/01 19:31:16 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.10 2009/12/26 16:01:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.11 2011/07/01 19:31:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -53,7 +53,7 @@
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/arm/at91/at91cf.c
diff -u src/sys/arch/arm/at91/at91cf.c:1.2 src/sys/arch/arm/at91/at91cf.c:1.3
--- src/sys/arch/arm/at91/at91cf.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91cf.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91cf.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91cf.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <sys/kthread.h>
#include <uvm/uvm_param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
Index: src/sys/arch/arm/at91/at91pdc.c
diff -u src/sys/arch/arm/at91/at91pdc.c:1.2 src/sys/arch/arm/at91/at91pdc.c:1.3
--- src/sys/arch/arm/at91/at91pdc.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pdc.c Fri Jul 1 19:31:17 2011
@@ -1,7 +1,7 @@
-/* $Id: at91pdc.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91pdc.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91pdcvar.h>
int at91pdc_alloc_fifo(bus_dma_tag_t dmat, at91pdc_fifo_t *fifo, int size,
Index: src/sys/arch/arm/at91/at91spi.c
diff -u src/sys/arch/arm/at91/at91spi.c:1.2 src/sys/arch/arm/at91/at91spi.c:1.3
--- src/sys/arch/arm/at91/at91spi.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91spi.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91spi.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91spi.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $");
#include "locators.h"
@@ -57,7 +57,7 @@
#include <sys/errno.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/vmparam.h>
#include <sys/inttypes.h>
Index: src/sys/arch/arm/at91/at91dbgu.c
diff -u src/sys/arch/arm/at91/at91dbgu.c:1.5 src/sys/arch/arm/at91/at91dbgu.c:1.6
--- src/sys/arch/arm/at91/at91dbgu.c:1.5 Sun Apr 24 16:26:53 2011
+++ src/sys/arch/arm/at91/at91dbgu.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $ */
+/* $Id: at91dbgu.c,v 1.6 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.6 2011/07/01 19:31:17 dyoung Exp $ */
/*
*
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.6 2011/07/01 19:31:17 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -120,7 +120,7 @@
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91reg.h>
#include <arm/at91/at91var.h>
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.9 src/sys/arch/arm/at91/at91emac.c:1.10
--- src/sys/arch/arm/at91/at91emac.c:1.9 Mon Apr 5 07:19:29 2010
+++ src/sys/arch/arm/at91/at91emac.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.9 2010/04/05 07:19:29 joerg Exp $ */
-/* $NetBSD: at91emac.c,v 1.9 2010/04/05 07:19:29 joerg Exp $ */
+/* $Id: at91emac.c,v 1.10 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91emac.c,v 1.10 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.9 2010/04/05 07:19:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.10 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -46,7 +46,7 @@
#include <sys/device.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/at91/at91tctmr.c
diff -u src/sys/arch/arm/at91/at91tctmr.c:1.4 src/sys/arch/arm/at91/at91tctmr.c:1.5
--- src/sys/arch/arm/at91/at91tctmr.c:1.4 Sat Jun 19 19:47:34 2010
+++ src/sys/arch/arm/at91/at91tctmr.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/*$NetBSD: at91tctmr.c,v 1.4 2010/06/19 19:47:34 matt Exp $*/
+/*$NetBSD: at91tctmr.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $*/
/*
* AT91 Timer Counter (TC) based clock functions
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.4 2010/06/19 19:47:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,7 +52,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/at91/at91twi.c
diff -u src/sys/arch/arm/at91/at91twi.c:1.4 src/sys/arch/arm/at91/at91twi.c:1.5
--- src/sys/arch/arm/at91/at91twi.c:1.4 Sat Mar 14 21:04:05 2009
+++ src/sys/arch/arm/at91/at91twi.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91twi.c,v 1.4 2009/03/14 21:04:05 dsl Exp $ */
-/* $NetBSD: at91twi.c,v 1.4 2009/03/14 21:04:05 dsl Exp $ */
+/* $Id: at91twi.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91twi.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -31,13 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91twi.c,v 1.4 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91twi.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/lock.h>
#include <arm/at91/at91var.h>
Index: src/sys/arch/arm/at91/at91usart.c
diff -u src/sys/arch/arm/at91/at91usart.c:1.4 src/sys/arch/arm/at91/at91usart.c:1.5
--- src/sys/arch/arm/at91/at91usart.c:1.4 Sun Apr 24 16:26:53 2011
+++ src/sys/arch/arm/at91/at91usart.c Fri Jul 1 19:31:17 2011
@@ -1,5 +1,5 @@
-/* $Id: at91usart.c,v 1.4 2011/04/24 16:26:53 rmind Exp $ */
-/* $NetBSD: at91usart.c,v 1.4 2011/04/24 16:26:53 rmind Exp $ */
+/* $Id: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.4 2011/04/24 16:26:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -115,7 +115,7 @@
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91reg.h>
#include <arm/at91/at91var.h>
Index: src/sys/arch/arm/ep93xx/ep93xx_busdma.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.3 src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.4
--- src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.3 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/ep93xx_busdma.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_busdma.c,v 1.3 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: ep93xx_busdma.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.3 2009/10/23 00:39:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -42,7 +42,7 @@
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: src/sys/arch/arm/ep93xx/ep93xxvar.h
diff -u src/sys/arch/arm/ep93xx/ep93xxvar.h:1.3 src/sys/arch/arm/ep93xx/ep93xxvar.h:1.4
--- src/sys/arch/arm/ep93xx/ep93xxvar.h:1.3 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/ep93xxvar.h Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xxvar.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: ep93xxvar.h,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
* All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ep93xx_softc {
struct device sc_dev;
Index: src/sys/arch/arm/ep93xx/epgpio.c
diff -u src/sys/arch/arm/ep93xx/epgpio.c:1.3 src/sys/arch/arm/ep93xx/epgpio.c:1.4
--- src/sys/arch/arm/ep93xx/epgpio.c:1.3 Mon Aug 3 06:57:09 2009
+++ src/sys/arch/arm/ep93xx/epgpio.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $ */
+/* $NetBSD: epgpio.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,13 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sys/gpio.h>
#include <dev/gpio/gpiovar.h>
Index: src/sys/arch/arm/ep93xx/epsocvar.h
diff -u src/sys/arch/arm/ep93xx/epsocvar.h:1.3 src/sys/arch/arm/ep93xx/epsocvar.h:1.4
--- src/sys/arch/arm/ep93xx/epsocvar.h:1.3 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epsocvar.h Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epsocvar.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epsocvar.h,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
* All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct epgpio_softc;
Index: src/sys/arch/arm/ep93xx/epwdog.c
diff -u src/sys/arch/arm/ep93xx/epwdog.c:1.3 src/sys/arch/arm/ep93xx/epwdog.c:1.4
--- src/sys/arch/arm/ep93xx/epwdog.c:1.3 Mon Aug 21 15:01:54 2006
+++ src/sys/arch/arm/ep93xx/epwdog.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epwdog.c,v 1.3 2006/08/21 15:01:54 hamajima Exp $ */
+/* $NetBSD: epwdog.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,13 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epwdog.c,v 1.3 2006/08/21 15:01:54 hamajima Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epwdog.c,v 1.4 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/epwdogreg.h>
Index: src/sys/arch/arm/ep93xx/ep93xx_intr.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.15 src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.16
--- src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.15 Mon Dec 20 00:25:27 2010
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_intr.c,v 1.15 2010/12/20 00:25:27 matt Exp $ */
+/* $NetBSD: ep93xx_intr.c,v 1.16 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.15 2010/12/20 00:25:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.16 2011/07/01 19:31:17 dyoung Exp $");
/*
* Interrupt support for the Cirrus Logic EP93XX
@@ -44,7 +44,7 @@
#include <sys/malloc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/ep93xx/ep93xx_space.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_space.c:1.4 src/sys/arch/arm/ep93xx/ep93xx_space.c:1.5
--- src/sys/arch/arm/ep93xx/ep93xx_space.c:1.4 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/ep93xx_space.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_space.c,v 1.4 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: ep93xx_space.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.4 2009/10/23 00:39:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
/*
* bus_space I/O functions for ep93xx
@@ -39,7 +39,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: src/sys/arch/arm/ep93xx/epohci.c
diff -u src/sys/arch/arm/ep93xx/epohci.c:1.4 src/sys/arch/arm/ep93xx/epohci.c:1.5
--- src/sys/arch/arm/ep93xx/epohci.c:1.4 Sat Mar 14 15:36:01 2009
+++ src/sys/arch/arm/ep93xx/epohci.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epohci.c,v 1.4 2009/03/14 15:36:01 dsl Exp $ */
+/* $NetBSD: epohci.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.4 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <sys/mbuf.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: src/sys/arch/arm/ep93xx/eppcic.c
diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.4 src/sys/arch/arm/ep93xx/eppcic.c:1.5
--- src/sys/arch/arm/ep93xx/eppcic.c:1.4 Sun Jun 29 05:53:39 2008
+++ src/sys/arch/arm/ep93xx/eppcic.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eppcic.c,v 1.4 2008/06/29 05:53:39 hamajima Exp $ */
+/* $NetBSD: eppcic.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.4 2008/06/29 05:53:39 hamajima Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,7 +35,7 @@
#include <sys/device.h>
#include <sys/kthread.h>
#include <uvm/uvm_param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
Index: src/sys/arch/arm/ep93xx/eprtc.c
diff -u src/sys/arch/arm/ep93xx/eprtc.c:1.4 src/sys/arch/arm/ep93xx/eprtc.c:1.5
--- src/sys/arch/arm/ep93xx/eprtc.c:1.4 Tue Jan 5 13:14:56 2010
+++ src/sys/arch/arm/ep93xx/eprtc.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eprtc.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $ */
+/* $NetBSD: eprtc.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,14 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/eprtcreg.h>
Index: src/sys/arch/arm/ep93xx/epclk.c
diff -u src/sys/arch/arm/ep93xx/epclk.c:1.17 src/sys/arch/arm/ep93xx/epclk.c:1.18
--- src/sys/arch/arm/ep93xx/epclk.c:1.17 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epclk.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epclk.c,v 1.17 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epclk.c,v 1.18 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.17 2009/10/23 00:39:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.18 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,7 +50,7 @@
#include <sys/timetc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/ep93xx/epcom.c
diff -u src/sys/arch/arm/ep93xx/epcom.c:1.20 src/sys/arch/arm/ep93xx/epcom.c:1.21
--- src/sys/arch/arm/ep93xx/epcom.c:1.20 Sun Apr 24 16:26:53 2011
+++ src/sys/arch/arm/ep93xx/epcom.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.20 2011/04/24 16:26:53 rmind Exp $ */
+/* $NetBSD: epcom.c,v 1.21 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.20 2011/04/24 16:26:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.21 2011/07/01 19:31:17 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -111,7 +111,7 @@
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.25 src/sys/arch/arm/ep93xx/epe.c:1.26
--- src/sys/arch/arm/ep93xx/epe.c:1.25 Mon Apr 5 07:19:29 2010
+++ src/sys/arch/arm/ep93xx/epe.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.25 2010/04/05 07:19:29 joerg Exp $ */
+/* $NetBSD: epe.c,v 1.26 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.25 2010/04/05 07:19:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.26 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/ep93xx/epled.c
diff -u src/sys/arch/arm/ep93xx/epled.c:1.2 src/sys/arch/arm/ep93xx/epled.c:1.3
--- src/sys/arch/arm/ep93xx/epled.c:1.2 Sun Mar 26 04:38:52 2006
+++ src/sys/arch/arm/ep93xx/epled.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epled.c,v 1.2 2006/03/26 04:38:52 thorpej Exp $ */
+/* $NetBSD: epled.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,13 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epled.c,v 1.2 2006/03/26 04:38:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epled.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epgpiovar.h>
#include <arm/ep93xx/epledvar.h>
Index: src/sys/arch/arm/ep93xx/epsoc.c
diff -u src/sys/arch/arm/ep93xx/epsoc.c:1.10 src/sys/arch/arm/ep93xx/epsoc.c:1.11
--- src/sys/arch/arm/ep93xx/epsoc.c:1.10 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epsoc.c Fri Jul 1 19:31:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epsoc.c,v 1.10 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epsoc.c,v 1.11 2011/07/01 19:31:17 dyoung Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.10 2009/10/23 00:39:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.11 2011/07/01 19:31:17 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -36,7 +36,7 @@
#include <sys/time.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
