Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:55:27 UTC 2011
Modified Files:
src/sys/arch/amiga/amiga: busfuncs.c simple_busfuncs.c
src/sys/arch/amiga/dev: aster.c com_supio.c drsupio.c gvpio.c hyper.c
if_bah_zbus.c if_ne_zbus.c ioblix_zbus.c isic_supio.c lpt_supio.c
melody.c repulse.c toccata.c wdc_amiga.c wdc_buddha.c
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/amiga/busfuncs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/amiga/simple_busfuncs.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/dev/aster.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/com_supio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/dev/drsupio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amiga/dev/gvpio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/dev/hyper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amiga/dev/if_bah_zbus.c \
src/sys/arch/amiga/dev/if_ne_zbus.c src/sys/arch/amiga/dev/lpt_supio.c \
src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/ioblix_zbus.c \
src/sys/arch/amiga/dev/isic_supio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/melody.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/repulse.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/wdc_buddha.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/amiga/amiga/busfuncs.c
diff -u src/sys/arch/amiga/amiga/busfuncs.c:1.11 src/sys/arch/amiga/amiga/busfuncs.c:1.12
--- src/sys/arch/amiga/amiga/busfuncs.c:1.11 Wed Feb 3 13:56:53 2010
+++ src/sys/arch/amiga/amiga/busfuncs.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $ */
+/* $NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $");
/*
* Amiga bus access methods for data widths > 1
* XXX currently, only 16bit methods are defined
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
bsr(amiga_contiguous_read_2, u_int16_t);
bsw(amiga_contiguous_write_2, u_int16_t);
Index: src/sys/arch/amiga/amiga/simple_busfuncs.c
diff -u src/sys/arch/amiga/amiga/simple_busfuncs.c:1.6 src/sys/arch/amiga/amiga/simple_busfuncs.c:1.7
--- src/sys/arch/amiga/amiga/simple_busfuncs.c:1.6 Wed Feb 3 13:56:53 2010
+++ src/sys/arch/amiga/amiga/simple_busfuncs.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $ */
+/* $NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $");
/*
* Do NOT use this standalone.
@@ -44,7 +44,7 @@
Error AMIGA_SIMPLE_BUS_STRIDE not defined in __FILE__, line __LINE__ .
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#define MKN2(x,y) __CONCAT(x, y)
#define MKN1(x,y) MKN2(x, y)
Index: src/sys/arch/amiga/dev/aster.c
diff -u src/sys/arch/amiga/dev/aster.c:1.21 src/sys/arch/amiga/dev/aster.c:1.22
--- src/sys/arch/amiga/dev/aster.c:1.21 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/aster.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $ */
/*-
* Copyright (c) 1998,2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $");
/*
* zbus ISDN Blaster, ISDN Master driver.
@@ -42,8 +42,7 @@
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <amiga/include/cpu.h>
Index: src/sys/arch/amiga/dev/com_supio.c
diff -u src/sys/arch/amiga/dev/com_supio.c:1.29 src/sys/arch/amiga/dev/com_supio.c:1.30
--- src/sys/arch/amiga/dev/com_supio.c:1.29 Sat Jan 22 17:10:20 2011
+++ src/sys/arch/amiga/dev/com_supio.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $ */
+/* $NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,9 +76,9 @@
#include <sys/syslog.h>
#include <sys/types.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
/*#include <dev/isa/isavar.h>*/
#include <dev/ic/comreg.h>
Index: src/sys/arch/amiga/dev/drsupio.c
diff -u src/sys/arch/amiga/dev/drsupio.c:1.19 src/sys/arch/amiga/dev/drsupio.c:1.20
--- src/sys/arch/amiga/dev/drsupio.c:1.19 Mon Dec 20 00:25:25 2010
+++ src/sys/arch/amiga/dev/drsupio.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: drsupio.c,v 1.19 2010/12/20 00:25:25 matt Exp $ */
+/* $NetBSD: drsupio.c,v 1.20 2011/07/19 15:55:26 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.19 2010/12/20 00:25:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.20 2011/07/19 15:55:26 dyoung Exp $");
/*
* DraCo multi-io chip bus space stuff
@@ -42,8 +42,7 @@
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <amiga/include/cpu.h>
Index: src/sys/arch/amiga/dev/gvpio.c
diff -u src/sys/arch/amiga/dev/gvpio.c:1.18 src/sys/arch/amiga/dev/gvpio.c:1.19
--- src/sys/arch/amiga/dev/gvpio.c:1.18 Tue Feb 2 19:03:31 2010
+++ src/sys/arch/amiga/dev/gvpio.c Tue Jul 19 15:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $ */
+/* $NetBSD: gvpio.c,v 1.19 2011/07/19 15:55:26 dyoung Exp $ */
/*
* Copyright (c) 1997 Ignatios Souvatzis
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.19 2011/07/19 15:55:26 dyoung Exp $");
/*
* GVP I/O Extender
@@ -38,8 +38,8 @@
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <amiga/include/cpu.h>
Index: src/sys/arch/amiga/dev/hyper.c
diff -u src/sys/arch/amiga/dev/hyper.c:1.20 src/sys/arch/amiga/dev/hyper.c:1.21
--- src/sys/arch/amiga/dev/hyper.c:1.20 Tue Feb 2 19:03:31 2010
+++ src/sys/arch/amiga/dev/hyper.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $ */
+/* $NetBSD: hyper.c,v 1.21 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.21 2011/07/19 15:55:27 dyoung Exp $");
/*
* zbus HyperCom driver
@@ -42,8 +42,7 @@
#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <amiga/include/cpu.h>
Index: src/sys/arch/amiga/dev/if_bah_zbus.c
diff -u src/sys/arch/amiga/dev/if_bah_zbus.c:1.13 src/sys/arch/amiga/dev/if_bah_zbus.c:1.14
--- src/sys/arch/amiga/dev/if_bah_zbus.c:1.13 Mon Oct 18 22:02:25 2010
+++ src/sys/arch/amiga/dev/if_bah_zbus.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $ */
+/* $NetBSD: if_bah_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
/*
* Driver frontend for the Commodore Busines Machines and the
@@ -50,8 +50,8 @@
#include <sys/socket.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
Index: src/sys/arch/amiga/dev/if_ne_zbus.c
diff -u src/sys/arch/amiga/dev/if_ne_zbus.c:1.13 src/sys/arch/amiga/dev/if_ne_zbus.c:1.14
--- src/sys/arch/amiga/dev/if_ne_zbus.c:1.13 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/if_ne_zbus.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_zbus.c,v 1.13 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: if_ne_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.13 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
/*
* Thanks to Village Tronic for giving me a card.
@@ -44,13 +44,12 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
Index: src/sys/arch/amiga/dev/lpt_supio.c
diff -u src/sys/arch/amiga/dev/lpt_supio.c:1.13 src/sys/arch/amiga/dev/lpt_supio.c:1.14
--- src/sys/arch/amiga/dev/lpt_supio.c:1.13 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/lpt_supio.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_supio.c,v 1.13 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: lpt_supio.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_supio.c,v 1.13 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_supio.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,9 +45,9 @@
#include <sys/syslog.h>
#include <sys/types.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: src/sys/arch/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.13 src/sys/arch/amiga/dev/toccata.c:1.14
--- src/sys/arch/amiga/dev/toccata.c:1.13 Thu Jun 2 14:12:24 2011
+++ src/sys/arch/amiga/dev/toccata.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.13 2011/06/02 14:12:24 tsutsui Exp $ */
+/* $NetBSD: toccata.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.13 2011/06/02 14:12:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,8 +38,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/fcntl.h> /* FREAD */
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: src/sys/arch/amiga/dev/ioblix_zbus.c
diff -u src/sys/arch/amiga/dev/ioblix_zbus.c:1.17 src/sys/arch/amiga/dev/ioblix_zbus.c:1.18
--- src/sys/arch/amiga/dev/ioblix_zbus.c:1.17 Wed Jul 21 01:33:59 2010
+++ src/sys/arch/amiga/dev/ioblix_zbus.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ioblix_zbus.c,v 1.17 2010/07/21 01:33:59 jklos Exp $ */
+/* $NetBSD: ioblix_zbus.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.17 2010/07/21 01:33:59 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $");
/* IOBlix Zorro driver */
/* XXX to be done: we need to probe the com clock speed! */
@@ -41,8 +41,7 @@
#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <amiga/include/cpu.h>
Index: src/sys/arch/amiga/dev/isic_supio.c
diff -u src/sys/arch/amiga/dev/isic_supio.c:1.17 src/sys/arch/amiga/dev/isic_supio.c:1.18
--- src/sys/arch/amiga/dev/isic_supio.c:1.17 Tue May 19 18:39:26 2009
+++ src/sys/arch/amiga/dev/isic_supio.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_supio.c,v 1.17 2009/05/19 18:39:26 phx Exp $ */
+/* $NetBSD: isic_supio.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $ */
/*
* Copyright (c) 1998,2001 Ignatios Souvatzis. All rights reserved.
@@ -47,7 +47,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_supio.c,v 1.17 2009/05/19 18:39:26 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_supio.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -58,10 +58,10 @@
#include <net/if.h>
#include <sys/systm.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000
#include <sys/callout.h>
Index: src/sys/arch/amiga/dev/melody.c
diff -u src/sys/arch/amiga/dev/melody.c:1.15 src/sys/arch/amiga/dev/melody.c:1.16
--- src/sys/arch/amiga/dev/melody.c:1.15 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/melody.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: melody.c,v 1.15 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: melody.c,v 1.16 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: melody.c,v 1.15 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: melody.c,v 1.16 2011/07/19 15:55:27 dyoung Exp $");
/*
* Melody audio driver.
@@ -44,12 +44,11 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <dev/ic/tms320av110reg.h>
#include <dev/ic/tms320av110var.h>
-#include <machine/bus.h>
-
#include <amiga/dev/zbusvar.h>
#include <amiga/amiga/isr.h>
Index: src/sys/arch/amiga/dev/repulse.c
diff -u src/sys/arch/amiga/dev/repulse.c:1.16 src/sys/arch/amiga/dev/repulse.c:1.17
--- src/sys/arch/amiga/dev/repulse.c:1.16 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/repulse.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: repulse.c,v 1.16 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: repulse.c,v 1.17 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.16 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.17 2011/07/19 15:55:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,8 +38,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/fcntl.h> /* FREAD */
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: src/sys/arch/amiga/dev/wdc_amiga.c
diff -u src/sys/arch/amiga/dev/wdc_amiga.c:1.32 src/sys/arch/amiga/dev/wdc_amiga.c:1.33
--- src/sys/arch/amiga/dev/wdc_amiga.c:1.32 Thu Jan 13 22:02:05 2011
+++ src/sys/arch/amiga/dev/wdc_amiga.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_amiga.c,v 1.32 2011/01/13 22:02:05 phx Exp $ */
+/* $NetBSD: wdc_amiga.c,v 1.33 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.32 2011/01/13 22:02:05 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.33 2011/07/19 15:55:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <sys/bswap.h>
Index: src/sys/arch/amiga/dev/wdc_buddha.c
diff -u src/sys/arch/amiga/dev/wdc_buddha.c:1.4 src/sys/arch/amiga/dev/wdc_buddha.c:1.5
--- src/sys/arch/amiga/dev/wdc_buddha.c:1.4 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/wdc_buddha.c Tue Jul 19 15:55:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_buddha.c,v 1.4 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: wdc_buddha.c,v 1.5 2011/07/19 15:55:27 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,9 +34,9 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/bswap.h>
