Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:50:42 UTC 2011
Modified Files:
src/sys/arch/sparc/dev: bootbus.c cgsix_obio.c com_ebus.c com_obio.c
dma_obio.c ebus.c esp_obio.c if_ie_obio.c if_le_obio.c
kbd_pckbport.c ms_pckbport.c obio.c rtc.c sbus.c sw.c tctrl.c
ts102.c vme_machdep.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/sparc/dev/bootbus.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/dev/cgsix_obio.c \
src/sys/arch/sparc/dev/com_obio.c src/sys/arch/sparc/dev/esp_obio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/dev/com_ebus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/dev/dma_obio.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/dev/ebus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc/dev/if_ie_obio.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/if_le_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/dev/kbd_pckbport.c \
src/sys/arch/sparc/dev/ms_pckbport.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/dev/rtc.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sparc/dev/sbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/dev/sw.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/dev/tctrl.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/dev/ts102.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc/dev/vme_machdep.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/sparc/dev/bootbus.c
diff -u src/sys/arch/sparc/dev/bootbus.c:1.17 src/sys/arch/sparc/dev/bootbus.c:1.18
--- src/sys/arch/sparc/dev/bootbus.c:1.17 Sun Sep 20 16:18:21 2009
+++ src/sys/arch/sparc/dev/bootbus.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $ */
+/* $NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -42,7 +42,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/cpuunitvar.h>
#include <sparc/dev/bootbusvar.h>
Index: src/sys/arch/sparc/dev/cgsix_obio.c
diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.23 src/sys/arch/sparc/dev/cgsix_obio.c:1.24
--- src/sys/arch/sparc/dev/cgsix_obio.c:1.23 Fri Dec 12 18:50:13 2008
+++ src/sys/arch/sparc/dev/cgsix_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $ */
+/* $NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <sys/syslog.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
Index: src/sys/arch/sparc/dev/com_obio.c
diff -u src/sys/arch/sparc/dev/com_obio.c:1.23 src/sys/arch/sparc/dev/com_obio.c:1.24
--- src/sys/arch/sparc/dev/com_obio.c:1.23 Sat Nov 21 04:16:51 2009
+++ src/sys/arch/sparc/dev/com_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $ */
+/* $NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/sparc/dev/esp_obio.c
diff -u src/sys/arch/sparc/dev/esp_obio.c:1.23 src/sys/arch/sparc/dev/esp_obio.c:1.24
--- src/sys/arch/sparc/dev/esp_obio.c:1.23 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sparc/dev/esp_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -46,7 +46,7 @@
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/sparc/dev/com_ebus.c
diff -u src/sys/arch/sparc/dev/com_ebus.c:1.15 src/sys/arch/sparc/dev/com_ebus.c:1.16
--- src/sys/arch/sparc/dev/com_ebus.c:1.15 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sparc/dev/com_ebus.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ebus.c,v 1.15 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.15 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/sparc/dev/dma_obio.c
diff -u src/sys/arch/sparc/dev/dma_obio.c:1.11 src/sys/arch/sparc/dev/dma_obio.c:1.12
--- src/sys/arch/sparc/dev/dma_obio.c:1.11 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sparc/dev/dma_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_obio.c,v 1.11 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.11 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/cpu.h>
Index: src/sys/arch/sparc/dev/ebus.c
diff -u src/sys/arch/sparc/dev/ebus.c:1.31 src/sys/arch/sparc/dev/ebus.c:1.32
--- src/sys/arch/sparc/dev/ebus.c:1.31 Sun Sep 20 16:18:21 2009
+++ src/sys/arch/sparc/dev/ebus.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $ */
+/* $NetBSD: ebus.c,v 1.32 2011/07/01 18:50:41 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.32 2011/07/01 18:50:41 dyoung Exp $");
#if defined(DEBUG) && !defined(EBUS_DEBUG)
#define EBUS_DEBUG
@@ -60,7 +60,7 @@
#include <sys/kernel.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/sparc/dev/if_ie_obio.c
diff -u src/sys/arch/sparc/dev/if_ie_obio.c:1.39 src/sys/arch/sparc/dev/if_ie_obio.c:1.40
--- src/sys/arch/sparc/dev/if_ie_obio.c:1.39 Fri Jun 3 16:28:40 2011
+++ src/sys/arch/sparc/dev/if_ie_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_obio.c,v 1.39 2011/06/03 16:28:40 tsutsui Exp $ */
+/* $NetBSD: if_ie_obio.c,v 1.40 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.39 2011/06/03 16:28:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.40 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc/dev/if_le_obio.c
diff -u src/sys/arch/sparc/dev/if_le_obio.c:1.26 src/sys/arch/sparc/dev/if_le_obio.c:1.27
--- src/sys/arch/sparc/dev/if_le_obio.c:1.26 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sparc/dev/if_le_obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_obio.c,v 1.26 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: if_le_obio.c,v 1.27 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_obio.c,v 1.26 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_obio.c,v 1.27 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc/dev/kbd_pckbport.c
diff -u src/sys/arch/sparc/dev/kbd_pckbport.c:1.5 src/sys/arch/sparc/dev/kbd_pckbport.c:1.6
--- src/sys/arch/sparc/dev/kbd_pckbport.c:1.5 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sparc/dev/kbd_pckbport.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_pckbport.c,v 1.5 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -90,7 +90,7 @@
* @(#)pccons.c 5.11 (Berkeley) 5/21/91
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.5 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $");
/*
* Serve JavaStation-1 PS/2 keyboard as a Type5 keyboard with US101A
@@ -108,7 +108,7 @@
#include <sys/select.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/sun/kbd_reg.h>
Index: src/sys/arch/sparc/dev/ms_pckbport.c
diff -u src/sys/arch/sparc/dev/ms_pckbport.c:1.5 src/sys/arch/sparc/dev/ms_pckbport.c:1.6
--- src/sys/arch/sparc/dev/ms_pckbport.c:1.5 Sat Jan 17 14:35:06 2009
+++ src/sys/arch/sparc/dev/ms_pckbport.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_pckbport.c,v 1.5 2009/01/17 14:35:06 he Exp $ */
+/* $NetBSD: ms_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_pckbport.c,v 1.5 2009/01/17 14:35:06 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $");
/*
* Attach PS/2 mouse at pckbport aux port
@@ -43,7 +43,7 @@
#include <sys/proc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pckbport/pckbportvar.h>
Index: src/sys/arch/sparc/dev/obio.c
diff -u src/sys/arch/sparc/dev/obio.c:1.71 src/sys/arch/sparc/dev/obio.c:1.72
--- src/sys/arch/sparc/dev/obio.c:1.71 Sat May 17 18:11:32 2008
+++ src/sys/arch/sparc/dev/obio.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.71 2008/05/17 18:11:32 macallan Exp $ */
+/* $NetBSD: obio.c,v 1.72 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.71 2008/05/17 18:11:32 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.72 2011/07/01 18:50:41 dyoung Exp $");
#include "locators.h"
@@ -46,7 +46,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/dev/sbusvar.h>
#include <machine/autoconf.h>
#include <machine/oldmon.h>
Index: src/sys/arch/sparc/dev/rtc.c
diff -u src/sys/arch/sparc/dev/rtc.c:1.16 src/sys/arch/sparc/dev/rtc.c:1.17
--- src/sys/arch/sparc/dev/rtc.c:1.16 Sat Dec 12 14:44:09 2009
+++ src/sys/arch/sparc/dev/rtc.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.16 2009/12/12 14:44:09 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.17 2011/07/01 18:50:41 dyoung Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.17 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -45,7 +45,7 @@
#include <sys/gmon.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/clock_subr.h>
Index: src/sys/arch/sparc/dev/sbus.c
diff -u src/sys/arch/sparc/dev/sbus.c:1.74 src/sys/arch/sparc/dev/sbus.c:1.75
--- src/sys/arch/sparc/dev/sbus.c:1.74 Sun Jan 3 23:03:20 2010
+++ src/sys/arch/sparc/dev/sbus.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.74 2010/01/03 23:03:20 mrg Exp $ */
+/* $NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.74 2010/01/03 23:03:20 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -85,7 +85,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/dev/sbusreg.h>
#include <dev/sbus/sbusvar.h>
#include <dev/sbus/xboxvar.h>
Index: src/sys/arch/sparc/dev/sw.c
diff -u src/sys/arch/sparc/dev/sw.c:1.22 src/sys/arch/sparc/dev/sw.c:1.23
--- src/sys/arch/sparc/dev/sw.c:1.22 Tue Dec 16 22:35:25 2008
+++ src/sys/arch/sparc/dev/sw.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sw.c,v 1.22 2008/12/16 22:35:25 christos Exp $ */
+/* $NetBSD: sw.c,v 1.23 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.22 2008/12/16 22:35:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.23 2011/07/01 18:50:41 dyoung Exp $");
#include "opt_ddb.h"
@@ -98,7 +98,7 @@
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc/dev/tctrl.c
diff -u src/sys/arch/sparc/dev/tctrl.c:1.51 src/sys/arch/sparc/dev/tctrl.c:1.52
--- src/sys/arch/sparc/dev/tctrl.c:1.51 Mon Jun 20 16:33:42 2011
+++ src/sys/arch/sparc/dev/tctrl.c Fri Jul 1 18:50:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.c,v 1.51 2011/06/20 16:33:42 pgoyette Exp $ */
+/* $NetBSD: tctrl.c,v 1.52 2011/07/01 18:50:41 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.51 2011/06/20 16:33:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.52 2011/07/01 18:50:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <machine/apmvar.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/tctrl.h>
Index: src/sys/arch/sparc/dev/ts102.c
diff -u src/sys/arch/sparc/dev/ts102.c:1.14 src/sys/arch/sparc/dev/ts102.c:1.15
--- src/sys/arch/sparc/dev/ts102.c:1.14 Thu Sep 17 16:28:12 2009
+++ src/sys/arch/sparc/dev/ts102.c Fri Jul 1 18:50:42 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $ */
-/* $NetBSD: ts102.c,v 1.14 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: ts102.c,v 1.15 2011/07/01 18:50:42 dyoung Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
* Copyright (c) 2005, Michael Lorenz.
@@ -77,7 +77,7 @@
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.63 src/sys/arch/sparc/dev/vme_machdep.c:1.64
--- src/sys/arch/sparc/dev/vme_machdep.c:1.63 Fri Jan 14 02:06:31 2011
+++ src/sys/arch/sparc/dev/vme_machdep.c Fri Jul 1 18:50:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.63 2011/01/14 02:06:31 rmind Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.64 2011/07/01 18:50:42 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.63 2011/01/14 02:06:31 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.64 2011/07/01 18:50:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -45,7 +45,7 @@
#include <uvm/uvm_extern.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/iommuvar.h>
#include <machine/autoconf.h>
#include <machine/oldmon.h>
