Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:48:37 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: com_ebus.c ebus.c ebus_mainbus.c ebusvar.h
ffb.c ffb_mainbus.c gfb.c iommu.c lpt_ebus.c mkclock.c
pcfiic_ebus.c pci_machdep.c psm.c psycho.c pyro.c rtc.c sbus.c
sbusvar.h schizo.c upa.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sparc64/dev/com_ebus.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/ebusvar.h \
src/sys/arch/sparc64/dev/ffb_mainbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc64/dev/lpt_ebus.c \
src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/dev/mkclock.c \
src/sys/arch/sparc64/dev/pyro.c src/sys/arch/sparc64/dev/rtc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/pcfiic_ebus.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc64/dev/pci_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/psm.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc64/dev/sbusvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/dev/upa.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/sparc64/dev/com_ebus.c
diff -u src/sys/arch/sparc64/dev/com_ebus.c:1.32 src/sys/arch/sparc64/dev/com_ebus.c:1.33
--- src/sys/arch/sparc64/dev/com_ebus.c:1.32 Thu Jun 2 00:16:22 2011
+++ src/sys/arch/sparc64/dev/com_ebus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $ */
+/* $NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/tty.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: src/sys/arch/sparc64/dev/ebus.c
diff -u src/sys/arch/sparc64/dev/ebus.c:1.57 src/sys/arch/sparc64/dev/ebus.c:1.58
--- src/sys/arch/sparc64/dev/ebus.c:1.57 Thu Jun 2 00:24:23 2011
+++ src/sys/arch/sparc64/dev/ebus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $ */
+/* $NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $");
#include "opt_ddb.h"
@@ -64,7 +64,7 @@
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: src/sys/arch/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.4 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.5
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.4 Thu Jun 2 00:24:23 2011
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.4 2011/06/02 00:24:23 christos Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.5 2011/07/01 18:48:36 dyoung Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -40,7 +40,7 @@
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: src/sys/arch/sparc64/dev/ebusvar.h
diff -u src/sys/arch/sparc64/dev/ebusvar.h:1.10 src/sys/arch/sparc64/dev/ebusvar.h:1.11
--- src/sys/arch/sparc64/dev/ebusvar.h:1.10 Thu Jun 2 00:24:23 2011
+++ src/sys/arch/sparc64/dev/ebusvar.h Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebusvar.h,v 1.10 2011/06/02 00:24:23 christos Exp $ */
+/* $NetBSD: ebusvar.h,v 1.11 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -36,7 +36,7 @@
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/sparc64/dev/ffb_mainbus.c
diff -u src/sys/arch/sparc64/dev/ffb_mainbus.c:1.10 src/sys/arch/sparc64/dev/ffb_mainbus.c:1.11
--- src/sys/arch/sparc64/dev/ffb_mainbus.c:1.10 Fri Jun 3 03:20:39 2011
+++ src/sys/arch/sparc64/dev/ffb_mainbus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb_mainbus.c,v 1.10 2011/06/03 03:20:39 christos Exp $ */
+/* $NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $ */
/* $OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.10 2011/06/03 03:20:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -42,7 +42,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.43 src/sys/arch/sparc64/dev/ffb.c:1.44
--- src/sys/arch/sparc64/dev/ffb.c:1.43 Fri Jun 3 03:20:39 2011
+++ src/sys/arch/sparc64/dev/ffb.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.43 2011/06/03 03:20:39 christos Exp $ */
+/* $NetBSD: ffb.c,v 1.44 2011/07/01 18:48:36 dyoung Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.43 2011/06/03 03:20:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.44 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,7 +45,7 @@
#include <sys/malloc.h>
#include <sys/mman.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <machine/vmparam.h>
Index: src/sys/arch/sparc64/dev/gfb.c
diff -u src/sys/arch/sparc64/dev/gfb.c:1.3 src/sys/arch/sparc64/dev/gfb.c:1.4
--- src/sys/arch/sparc64/dev/gfb.c:1.3 Tue Aug 31 03:08:23 2010
+++ src/sys/arch/sparc64/dev/gfb.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gfb.c,v 1.3 2010/08/31 03:08:23 macallan Exp $ */
+/* $NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.3 2010/08/31 03:08:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <dev/videomode/videomode.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: src/sys/arch/sparc64/dev/iommu.c
diff -u src/sys/arch/sparc64/dev/iommu.c:1.103 src/sys/arch/sparc64/dev/iommu.c:1.104
--- src/sys/arch/sparc64/dev/iommu.c:1.103 Sun Mar 20 21:26:36 2011
+++ src/sys/arch/sparc64/dev/iommu.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.103 2011/03/20 21:26:36 mrg Exp $ */
+/* $NetBSD: iommu.c,v 1.104 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.103 2011/03/20 21:26:36 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.104 2011/07/01 18:48:36 dyoung Exp $");
#include "opt_ddb.h"
@@ -72,7 +72,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc64/dev/iommureg.h>
#include <sparc64/dev/iommuvar.h>
Index: src/sys/arch/sparc64/dev/lpt_ebus.c
diff -u src/sys/arch/sparc64/dev/lpt_ebus.c:1.22 src/sys/arch/sparc64/dev/lpt_ebus.c:1.23
--- src/sys/arch/sparc64/dev/lpt_ebus.c:1.22 Thu May 29 14:51:26 2008
+++ src/sys/arch/sparc64/dev/lpt_ebus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ebus.c,v 1.22 2008/05/29 14:51:26 mrg Exp $ */
+/* $NetBSD: lpt_ebus.c,v 1.23 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v 1.22 2008/05/29 14:51:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v 1.23 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ebus/ebusreg.h>
#include <dev/ebus/ebusvar.h>
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.22 src/sys/arch/sparc64/dev/schizo.c:1.23
--- src/sys/arch/sparc64/dev/schizo.c:1.22 Fri Jun 3 03:02:12 2011
+++ src/sys/arch/sparc64/dev/schizo.c Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.22 2011/06/03 03:02:12 christos Exp $ */
+/* $NetBSD: schizo.c,v 1.23 2011/07/01 18:48:37 dyoung Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -39,7 +39,7 @@
#include <sys/reboot.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/psl.h>
Index: src/sys/arch/sparc64/dev/mkclock.c
diff -u src/sys/arch/sparc64/dev/mkclock.c:1.7 src/sys/arch/sparc64/dev/mkclock.c:1.8
--- src/sys/arch/sparc64/dev/mkclock.c:1.7 Sat Mar 12 11:42:57 2011
+++ src/sys/arch/sparc64/dev/mkclock.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $ */
+/* $NetBSD: mkclock.c,v 1.8 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.8 2011/07/01 18:48:36 dyoung Exp $");
/*
* Clock driver for 'mkclock' - Mostek MK48Txx TOD clock.
@@ -71,7 +71,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/cpu.h>
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.7 src/sys/arch/sparc64/dev/pyro.c:1.8
--- src/sys/arch/sparc64/dev/pyro.c:1.7 Fri Jun 3 03:02:36 2011
+++ src/sys/arch/sparc64/dev/pyro.c Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.7 2011/06/03 03:02:36 christos Exp $ */
+/* $NetBSD: pyro.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -37,7 +37,7 @@
#include <sys/systm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#ifdef DDB
Index: src/sys/arch/sparc64/dev/rtc.c
diff -u src/sys/arch/sparc64/dev/rtc.c:1.7 src/sys/arch/sparc64/dev/rtc.c:1.8
--- src/sys/arch/sparc64/dev/rtc.c:1.7 Thu Mar 11 03:54:56 2010
+++ src/sys/arch/sparc64/dev/rtc.c Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $ */
+/* $NetBSD: rtc.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $");
/*
* Clock driver for 'rtc' - mc146818 driver.
@@ -67,7 +67,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/clock_subr.h>
Index: src/sys/arch/sparc64/dev/pcfiic_ebus.c
diff -u src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.1 src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.2
--- src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.1 Sun Feb 28 11:49:44 2010
+++ src/sys/arch/sparc64/dev/pcfiic_ebus.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcfiic_ebus.c,v 1.1 2010/02/28 11:49:44 martin Exp $ */
+/* $NetBSD: pcfiic_ebus.c,v 1.2 2011/07/01 18:48:36 dyoung Exp $ */
/* $OpenBSD: pcfiic_ebus.c,v 1.13 2008/06/08 03:07:40 deraadt Exp $ */
/*
@@ -29,7 +29,7 @@
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc64/dev/pci_machdep.c
diff -u src/sys/arch/sparc64/dev/pci_machdep.c:1.72 src/sys/arch/sparc64/dev/pci_machdep.c:1.73
--- src/sys/arch/sparc64/dev/pci_machdep.c:1.72 Wed May 11 22:26:46 2011
+++ src/sys/arch/sparc64/dev/pci_machdep.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.72 2011/05/11 22:26:46 macallan Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.73 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.72 2011/05/11 22:26:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.73 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -42,7 +42,7 @@
#include <sys/malloc.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/sparc64/dev/psm.c
diff -u src/sys/arch/sparc64/dev/psm.c:1.8 src/sys/arch/sparc64/dev/psm.c:1.9
--- src/sys/arch/sparc64/dev/psm.c:1.8 Fri Jun 3 03:09:02 2011
+++ src/sys/arch/sparc64/dev/psm.c Fri Jul 1 18:48:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: psm.c,v 1.8 2011/06/03 03:09:02 christos Exp $ */
+/* $NetBSD: psm.c,v 1.9 2011/07/01 18:48:36 dyoung Exp $ */
/*
* Copyright (c) 2006 Itronix Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
* time with APM at this point, and some of sysmon seems "lacking".
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.8 2011/06/03 03:09:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.9 2011/07/01 18:48:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@
#include <sys/kauth.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ebus/ebusreg.h>
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.107 src/sys/arch/sparc64/dev/psycho.c:1.108
--- src/sys/arch/sparc64/dev/psycho.c:1.107 Thu Jun 2 00:24:23 2011
+++ src/sys/arch/sparc64/dev/psycho.c Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.107 2011/06/02 00:24:23 christos Exp $ */
+/* $NetBSD: psycho.c,v 1.108 2011/07/01 18:48:37 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.107 2011/06/02 00:24:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.108 2011/07/01 18:48:37 dyoung Exp $");
#include "opt_ddb.h"
@@ -88,7 +88,7 @@
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/psl.h>
Index: src/sys/arch/sparc64/dev/sbus.c
diff -u src/sys/arch/sparc64/dev/sbus.c:1.87 src/sys/arch/sparc64/dev/sbus.c:1.88
--- src/sys/arch/sparc64/dev/sbus.c:1.87 Wed Mar 16 05:49:43 2011
+++ src/sys/arch/sparc64/dev/sbus.c Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.87 2011/03/16 05:49:43 mrg Exp $ */
+/* $NetBSD: sbus.c,v 1.88 2011/07/01 18:48:37 dyoung Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.87 2011/03/16 05:49:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.88 2011/07/01 18:48:37 dyoung Exp $");
#include "opt_ddb.h"
@@ -45,7 +45,7 @@
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <sparc64/dev/iommureg.h>
Index: src/sys/arch/sparc64/dev/sbusvar.h
diff -u src/sys/arch/sparc64/dev/sbusvar.h:1.17 src/sys/arch/sparc64/dev/sbusvar.h:1.18
--- src/sys/arch/sparc64/dev/sbusvar.h:1.17 Thu Sep 17 16:28:12 2009
+++ src/sys/arch/sparc64/dev/sbusvar.h Fri Jul 1 18:48:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbusvar.h,v 1.17 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: sbusvar.h,v 1.18 2011/07/01 18:48:37 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#ifndef _SBUS_VAR_SPARC64_H_
#define _SBUS_VAR_SPARC64_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Macro to convert a PROM virtual address to a bus_space_handle_t.
Index: src/sys/arch/sparc64/dev/upa.c
diff -u src/sys/arch/sparc64/dev/upa.c:1.16 src/sys/arch/sparc64/dev/upa.c:1.17
--- src/sys/arch/sparc64/dev/upa.c:1.16 Fri Jun 3 03:05:21 2011
+++ src/sys/arch/sparc64/dev/upa.c Fri Jul 1 18:48:37 2011
@@ -39,7 +39,7 @@
#include <sys/conf.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
