Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:31:39 UTC 2011
Modified Files:
src/sys/arch/arm/mainbus: mainbus.c mainbus.h mainbus_io.c
src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c s3c2410.c s3c2410_extint.c
s3c2410_intr.c s3c2410_spi.c s3c24x0_clk.c s3c24x0_lcd.c
s3c24x0_lcd.h s3c2800.c s3c2800_clk.c s3c2800_intr.c s3c2800_pci.c
s3c2xx0_busdma.c s3c2xx0_intr.c s3c2xx0_space.c s3c2xx0var.h
sscom_s3c2410.c sscom_s3c2800.c sscom_var.h
src/sys/arch/arm/sa11x0: sa1111.c sa11x0.c sa11x0_com.c sa11x0_io.c
sa11x0_ost.c sa11x0_var.h sa11x1_pcic.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/mainbus/mainbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/mainbus/mainbus.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus_io.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c \
src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c \
src/sys/arch/arm/s3c2xx0/sscom_var.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/s3c2xx0/s3c2410.c \
src/sys/arch/arm/s3c2xx0/s3c2410_extint.c \
src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/s3c2xx0/s3c2410_intr.c \
src/sys/arch/arm/s3c2xx0/s3c2800_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/s3c2xx0/s3c2410_spi.c \
src/sys/arch/arm/s3c2xx0/s3c2xx0var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/s3c2xx0/s3c2800.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/s3c2xx0/s3c2800_clk.c \
src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c \
src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/sa11x0/sa1111.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/sa11x0/sa11x0.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/sa11x0/sa11x0_com.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sa11x0/sa11x0_io.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/sa11x0/sa11x0_ost.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sa11x0/sa11x0_var.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sa11x0/sa11x1_pcic.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/mainbus/mainbus.c
diff -u src/sys/arch/arm/mainbus/mainbus.c:1.17 src/sys/arch/arm/mainbus/mainbus.c:1.18
--- src/sys/arch/arm/mainbus/mainbus.c:1.17 Sun Jun 5 17:03:16 2011
+++ src/sys/arch/arm/mainbus/mainbus.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@
#if defined(arm32) /* XXX */
#include <machine/io.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/mainbus/mainbus.h>
#include "locators.h"
Index: src/sys/arch/arm/mainbus/mainbus.h
diff -u src/sys/arch/arm/mainbus/mainbus.h:1.1 src/sys/arch/arm/mainbus/mainbus.h:1.2
--- src/sys/arch/arm/mainbus/mainbus.h:1.1 Sat Feb 24 19:38:02 2001
+++ src/sys/arch/arm/mainbus/mainbus.h Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.1 2001/02/24 19:38:02 reinoud Exp $ */
+/* $NetBSD: mainbus.h,v 1.2 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -41,7 +41,7 @@
* Created : 15/12/94
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* mainbus driver attach arguments
Index: src/sys/arch/arm/mainbus/mainbus_io.c
diff -u src/sys/arch/arm/mainbus/mainbus_io.c:1.20 src/sys/arch/arm/mainbus/mainbus_io.c:1.21
--- src/sys/arch/arm/mainbus/mainbus_io.c:1.20 Sat Nov 7 07:27:41 2009
+++ src/sys/arch/arm/mainbus/mainbus_io.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $ */
+/* $NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
diff -u src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.7 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.8
--- src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.7 Thu Nov 11 15:58:41 2010
+++ src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $ */
+/* $NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
/* derived from ohci_pci.c */
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c24x0var.h>
Index: src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c
diff -u src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c:1.7 src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c:1.8
--- src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c:1.7 Sat Nov 21 20:32:28 2009
+++ src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_s3c2800.c,v 1.7 2009/11/21 20:32:28 rmind Exp $ */
+/* $NetBSD: sscom_s3c2800.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2800.c,v 1.7 2009/11/21 20:32:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2800.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $");
#include "opt_sscom.h"
#include "opt_ddb.h"
@@ -57,7 +57,7 @@
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2800reg.h>
#include <arm/s3c2xx0/s3c2800var.h>
Index: src/sys/arch/arm/s3c2xx0/sscom_var.h
diff -u src/sys/arch/arm/s3c2xx0/sscom_var.h:1.7 src/sys/arch/arm/s3c2xx0/sscom_var.h:1.8
--- src/sys/arch/arm/s3c2xx0/sscom_var.h:1.7 Mon Mar 6 20:21:25 2006
+++ src/sys/arch/arm/s3c2xx0/sscom_var.h Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_var.h,v 1.7 2006/03/06 20:21:25 rjs Exp $ */
+/* $NetBSD: sscom_var.h,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -75,7 +75,7 @@
#include <sys/device.h>
#include <sys/termios.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef SSCOM_S3C2410
#include <arm/s3c2xx0/s3c2410reg.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2410.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410.c:1.10 src/sys/arch/arm/s3c2xx0/s3c2410.c:1.11
--- src/sys/arch/arm/s3c2xx0/s3c2410.c:1.10 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c2410.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410.c,v 1.10 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c2410.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2003, 2005 Genetec corporation. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.10 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,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/s3c2xx0/s3c2410_extint.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.10 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.11
--- src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.10 Tue Jan 5 13:14:56 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2410_extint.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $ */
+/* $NetBSD: s3c2410_extint.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -39,13 +39,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.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/s3c2xx0/s3c24x0_clk.c
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.10 src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.11
--- src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.10 Fri Jul 4 11:59:45 2008
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_clk.c,v 1.10 2008/07/04 11:59:45 bsh Exp $ */
+/* $NetBSD: s3c24x0_clk.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.10 2008/07/04 11:59:45 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2410_intr.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_intr.c:1.12 src/sys/arch/arm/s3c2xx0/s3c2410_intr.c:1.13
--- src/sys/arch/arm/s3c2xx0/s3c2410_intr.c:1.12 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2410_intr.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2410_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -35,13 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2800_intr.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800_intr.c:1.12 src/sys/arch/arm/s3c2xx0/s3c2800_intr.c:1.13
--- src/sys/arch/arm/s3c2xx0/s3c2800_intr.c:1.12 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2800_intr.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2800_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -38,13 +38,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2410_spi.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.5 src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.6
--- src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.5 Sat Mar 14 15:36:02 2009
+++ src/sys/arch/arm/s3c2xx0/s3c2410_spi.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_spi.c,v 1.5 2009/03/14 15:36:02 dsl Exp $ */
+/* $NetBSD: s3c2410_spi.c,v 1.6 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -35,13 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.5 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.6 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/s3c2xx0/s3c24x0var.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0var.h
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0var.h:1.5 src/sys/arch/arm/s3c2xx0/s3c2xx0var.h:1.6
--- src/sys/arch/arm/s3c2xx0/s3c2xx0var.h:1.5 Tue Nov 16 02:53:02 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0var.h Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0var.h,v 1.5 2010/11/16 02:53:02 bsh Exp $ */
+/* $NetBSD: s3c2xx0var.h,v 1.6 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -35,7 +35,7 @@
#ifndef _ARM_S3C2XX0VAR_H_
#define _ARM_S3C2XX0VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
struct s3c2xx0_softc {
Index: src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.6 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.7
--- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.6 Sat Dec 15 00:39:15 2007
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <dev/rasops/rasops.h>
#include <dev/wsfont/wsfont.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.4 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.5
--- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.4 Sun Mar 4 05:59:38 2007
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.h,v 1.4 2007/03/04 05:59:38 christos Exp $ */
+/* $NetBSD: s3c24x0_lcd.h,v 1.5 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -34,7 +34,7 @@
#define _ARM_S3C2XX0_S3C24X0_LCD_H
#include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* LCD Contoroller */
Index: src/sys/arch/arm/s3c2xx0/s3c2800.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800.c:1.11 src/sys/arch/arm/s3c2xx0/s3c2800.c:1.12
--- src/sys/arch/arm/s3c2xx0/s3c2800.c:1.11 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c2800.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800.c,v 1.11 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c2800.c,v 1.12 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.11 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.12 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,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/s3c2xx0/s3c2800_clk.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.15 src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.16
--- src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.15 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/arm/s3c2xx0/s3c2800_clk.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_clk.c,v 1.15 2009/03/18 10:22:24 cegger Exp $ */
+/* $NetBSD: s3c2800_clk.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.15 2009/03/18 10:22:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.15 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.16
--- src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.15 Tue May 17 17:34:48 2011
+++ src/sys/arch/arm/s3c2xx0/s3c2800_pci.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_pci.c,v 1.15 2011/05/17 17:34:48 dyoung Exp $ */
+/* $NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.15 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2800reg.h>
#include <arm/s3c2xx0/s3c2800var.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c:1.3 src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c:1.4
--- src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c:1.3 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0_busdma.c,v 1.3 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.3 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -46,7 +46,7 @@
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2xx0var.h>
Index: src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c
diff -u src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.3 src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.4
--- src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.3 Sat Nov 21 20:32:28 2009
+++ src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_s3c2410.c,v 1.3 2009/11/21 20:32:28 rmind Exp $ */
+/* $NetBSD: sscom_s3c2410.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2410.c,v 1.3 2009/11/21 20:32:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2410.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $");
#include "opt_sscom.h"
#include "opt_ddb.h"
@@ -57,7 +57,7 @@
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2410reg.h>
#include <arm/s3c2xx0/s3c2410var.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.14 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.15
--- src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.14 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0_intr.c,v 1.14 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2xx0_intr.c,v 1.15 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -73,13 +73,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.14 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.15 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c:1.8 src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c:1.9
--- src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c:1.8 Sat Nov 7 07:27:41 2009
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0_space.c,v 1.8 2009/11/07 07:27:41 cegger Exp $ */
+/* $NetBSD: s3c2xx0_space.c,v 1.9 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -74,14 +74,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_space.c,v 1.8 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_space.c,v 1.9 2011/07/01 20:31:39 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(s3c2xx0);
Index: src/sys/arch/arm/sa11x0/sa1111.c
diff -u src/sys/arch/arm/sa11x0/sa1111.c:1.23 src/sys/arch/arm/sa11x0/sa1111.c:1.24
--- src/sys/arch/arm/sa11x0/sa1111.c:1.23 Fri May 29 14:15:44 2009
+++ src/sys/arch/arm/sa11x0/sa1111.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa1111.c,v 1.23 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: sa1111.c,v 1.24 2011/07/01 20:31:39 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.23 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.24 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <sys/malloc.h>
#include <sys/uio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/sa11x0/sa11x0_reg.h>
Index: src/sys/arch/arm/sa11x0/sa11x0.c
diff -u src/sys/arch/arm/sa11x0/sa11x0.c:1.25 src/sys/arch/arm/sa11x0/sa11x0.c:1.26
--- src/sys/arch/arm/sa11x0/sa11x0.c:1.25 Sun Aug 9 06:12:33 2009
+++ src/sys/arch/arm/sa11x0/sa11x0.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0.c,v 1.25 2009/08/09 06:12:33 kiyohara Exp $ */
+/* $NetBSD: sa11x0.c,v 1.26 2011/07/01 20:31:39 dyoung Exp $ */
/*-
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.25 2009/08/09 06:12:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.26 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/arm32/psl.h>
#include <arm/arm32/machdep.h>
Index: src/sys/arch/arm/sa11x0/sa11x0_com.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_com.c:1.48 src/sys/arch/arm/sa11x0/sa11x0_com.c:1.49
--- src/sys/arch/arm/sa11x0/sa11x0_com.c:1.48 Sun Apr 24 16:26:54 2011
+++ src/sys/arch/arm/sa11x0/sa11x0_com.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_com.c,v 1.48 2011/04/24 16:26:54 rmind Exp $ */
+/* $NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.48 2011/04/24 16:26:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -93,7 +93,7 @@
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa11x0_reg.h>
#include <arm/sa11x0/sa11x0_var.h>
#include <arm/sa11x0/sa11x0_comreg.h>
Index: src/sys/arch/arm/sa11x0/sa11x0_io.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_io.c:1.18 src/sys/arch/arm/sa11x0/sa11x0_io.c:1.19
--- src/sys/arch/arm/sa11x0/sa11x0_io.c:1.18 Sat Nov 7 07:27:42 2009
+++ src/sys/arch/arm/sa11x0/sa11x0_io.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_io.c,v 1.18 2009/11/07 07:27:42 cegger Exp $ */
+/* $NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.18 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Prototypes for all the bus_space structure functions */
Index: src/sys/arch/arm/sa11x0/sa11x0_ost.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.28 src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.29
--- src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.28 Sun Aug 9 06:12:33 2009
+++ src/sys/arch/arm/sa11x0/sa11x0_ost.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_ost.c,v 1.28 2009/08/09 06:12:33 kiyohara Exp $ */
+/* $NetBSD: sa11x0_ost.c,v 1.29 2011/07/01 20:31:39 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.28 2009/08/09 06:12:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.29 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,7 +48,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/sa11x0/sa11x0_var.h
diff -u src/sys/arch/arm/sa11x0/sa11x0_var.h:1.10 src/sys/arch/arm/sa11x0/sa11x0_var.h:1.11
--- src/sys/arch/arm/sa11x0/sa11x0_var.h:1.10 Sun Aug 9 06:12:33 2009
+++ src/sys/arch/arm/sa11x0/sa11x0_var.h Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_var.h,v 1.10 2009/08/09 06:12:33 kiyohara Exp $ */
+/* $NetBSD: sa11x0_var.h,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
/*-
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct sa11x0_softc {
device_t sc_dev;
Index: src/sys/arch/arm/sa11x0/sa11x1_pcic.c
diff -u src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.20 src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.21
--- src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.20 Fri May 29 14:15:44 2009
+++ src/sys/arch/arm/sa11x0/sa11x1_pcic.c Fri Jul 1 20:31:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x1_pcic.c,v 1.20 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: sa11x1_pcic.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.c,v 1.20 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
