Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:07:43 UTC 2011
Modified Files:
src/sys/arch/shark/include: Makefile
src/sys/arch/shark/isa: isa_io.c isadma_machdep.c
src/sys/arch/shark/ofw: chipsfb_ofbus.c com_ofisa_machdep.c
if_cs_ofisa_machdep.c igsfb_ofbus.c lpt_ofisa_machdep.c
ofisa_machdep.c ofrom.c ofw.c wdc_ofisa_machdep.c
src/sys/arch/shark/shark: consinit.c i8042.c ns87307.c sequoia.c
Added Files:
src/sys/arch/shark/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/shark/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/include/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/arch/shark/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/shark/include/bus_defs.h \
src/sys/arch/shark/include/bus_funcs.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/isa/isa_io.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/isa/isadma_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/ofw/chipsfb_ofbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/shark/ofw/com_ofisa_machdep.c \
src/sys/arch/shark/ofw/wdc_ofisa_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c \
src/sys/arch/shark/ofw/ofisa_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/ofw/igsfb_ofbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/shark/ofw/lpt_ofisa_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/ofw/ofrom.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/shark/consinit.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/shark/shark/i8042.c \
src/sys/arch/shark/shark/ns87307.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/shark/sequoia.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/shark/include/Makefile
diff -u src/sys/arch/shark/include/Makefile:1.11 src/sys/arch/shark/include/Makefile:1.12
--- src/sys/arch/shark/include/Makefile:1.11 Sun Jul 17 20:54:47 2011
+++ src/sys/arch/shark/include/Makefile Tue Jul 19 15:07:42 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2011/07/17 20:54:47 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/07/19 15:07:42 dyoung Exp $
INCSDIR= /usr/include/shark
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/shark/isa/isa_io.c
diff -u src/sys/arch/shark/isa/isa_io.c:1.10 src/sys/arch/shark/isa/isa_io.c:1.11
--- src/sys/arch/shark/isa/isa_io.c:1.10 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/isa/isa_io.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -38,11 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
#include <machine/ofw.h>
Index: src/sys/arch/shark/isa/isadma_machdep.c
diff -u src/sys/arch/shark/isa/isadma_machdep.c:1.14 src/sys/arch/shark/isa/isadma_machdep.c:1.15
--- src/sys/arch/shark/isa/isadma_machdep.c:1.14 Wed Mar 18 10:22:36 2009
+++ src/sys/arch/shark/isa/isadma_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $");
#define ISA_DMA_STATS
@@ -44,7 +44,7 @@
#include <sys/mbuf.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/shark/ofw/chipsfb_ofbus.c
diff -u src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.1 src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.2
--- src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.1 Wed Mar 23 04:06:03 2011
+++ src/sys/arch/shark/ofw/chipsfb_ofbus.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $ */
+/* $NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,9 +39,9 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/ofw.h>
#include <machine/pmap.h>
Index: src/sys/arch/shark/ofw/com_ofisa_machdep.c
diff -u src/sys/arch/shark/ofw/com_ofisa_machdep.c:1.6 src/sys/arch/shark/ofw/com_ofisa_machdep.c:1.7
--- src/sys/arch/shark/ofw/com_ofisa_machdep.c:1.6 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/ofw/com_ofisa_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: com_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_compat_old_ofw.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/shark/ofw/wdc_ofisa_machdep.c
diff -u src/sys/arch/shark/ofw/wdc_ofisa_machdep.c:1.6 src/sys/arch/shark/ofw/wdc_ofisa_machdep.c:1.7
--- src/sys/arch/shark/ofw/wdc_ofisa_machdep.c:1.6 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/ofw/wdc_ofisa_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: wdc_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_compat_old_ofw.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c
diff -u src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.8 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.9
--- src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.8 Tue Sep 22 15:04:41 2009
+++ src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_ofisa_machdep.c,v 1.8 2009/09/22 15:04:41 tsutsui Exp $ */
+/* $NetBSD: if_cs_ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.8 2009/09/22 15:04:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_compat_old_ofw.h"
@@ -47,12 +47,12 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/socket.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/shark/ofw/ofisa_machdep.c
diff -u src/sys/arch/shark/ofw/ofisa_machdep.c:1.8 src/sys/arch/shark/ofw/ofisa_machdep.c:1.9
--- src/sys/arch/shark/ofw/ofisa_machdep.c:1.8 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/ofw/ofisa_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa_machdep.c,v 1.8 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa_machdep.c,v 1.8 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_compat_old_ofw.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/shark/ofw/igsfb_ofbus.c
diff -u src/sys/arch/shark/ofw/igsfb_ofbus.c:1.11 src/sys/arch/shark/ofw/igsfb_ofbus.c:1.12
--- src/sys/arch/shark/ofw/igsfb_ofbus.c:1.11 Mon Feb 28 10:05:04 2011
+++ src/sys/arch/shark/ofw/igsfb_ofbus.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_ofbus.c,v 1.11 2011/02/28 10:05:04 macallan Exp $ */
+/* $NetBSD: igsfb_ofbus.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_ofbus.c,v 1.11 2011/02/28 10:05:04 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_ofbus.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,9 +39,9 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/ofw.h>
#include <machine/pmap.h>
Index: src/sys/arch/shark/ofw/lpt_ofisa_machdep.c
diff -u src/sys/arch/shark/ofw/lpt_ofisa_machdep.c:1.7 src/sys/arch/shark/ofw/lpt_ofisa_machdep.c:1.8
--- src/sys/arch/shark/ofw/lpt_ofisa_machdep.c:1.7 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/ofw/lpt_ofisa_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ofisa_machdep.c,v 1.7 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: lpt_ofisa_machdep.c,v 1.8 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.7 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.8 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_compat_old_ofw.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/shark/ofw/ofrom.c
diff -u src/sys/arch/shark/ofw/ofrom.c:1.21 src/sys/arch/shark/ofw/ofrom.c:1.22
--- src/sys/arch/shark/ofw/ofrom.c:1.21 Sun Jun 12 03:35:46 2011
+++ src/sys/arch/shark/ofw/ofrom.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrom.c,v 1.21 2011/06/12 03:35:46 rmind Exp $ */
+/* $NetBSD: ofrom.c,v 1.22 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1998
@@ -38,17 +38,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.21 2011/06/12 03:35:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.22 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
#include <dev/ofw/openfirm.h>
struct ofrom_softc {
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.55 src/sys/arch/shark/ofw/ofw.c:1.56
--- src/sys/arch/shark/ofw/ofw.c:1.55 Wed Mar 23 04:06:03 2011
+++ src/sys/arch/shark/ofw/ofw.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.55 2011/03/23 04:06:03 macallan Exp $ */
+/* $NetBSD: ofw.c,v 1.56 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.55 2011/03/23 04:06:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.56 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@
#include <dev/cons.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/bootconfig.h>
#include <machine/cpu.h>
Index: src/sys/arch/shark/shark/consinit.c
diff -u src/sys/arch/shark/shark/consinit.c:1.10 src/sys/arch/shark/shark/consinit.c:1.11
--- src/sys/arch/shark/shark/consinit.c:1.10 Wed Mar 23 04:06:03 2011
+++ src/sys/arch/shark/shark/consinit.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.10 2011/03/23 04:06:03 macallan Exp $ */
+/* $NetBSD: consinit.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -27,13 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2011/03/23 04:06:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include "vga.h"
Index: src/sys/arch/shark/shark/i8042.c
diff -u src/sys/arch/shark/shark/i8042.c:1.5 src/sys/arch/shark/shark/i8042.c:1.6
--- src/sys/arch/shark/shark/i8042.c:1.5 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/shark/shark/i8042.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i8042.c,v 1.5 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: i8042.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -59,14 +59,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.5 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <machine/kerndebug.h>
-#include <machine/bus.h>
#include <shark/shark/i8042reg.h>
/*
** Global variables
Index: src/sys/arch/shark/shark/ns87307.c
diff -u src/sys/arch/shark/shark/ns87307.c:1.5 src/sys/arch/shark/shark/ns87307.c:1.6
--- src/sys/arch/shark/shark/ns87307.c:1.5 Thu Feb 22 16:50:42 2007
+++ src/sys/arch/shark/shark/ns87307.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ns87307.c,v 1.5 2007/02/22 16:50:42 thorpej Exp $ */
+/* $NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -57,16 +57,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.5 2007/02/22 16:50:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <dev/isa/isavar.h>
#include <shark/shark/ns87307reg.h>
Index: src/sys/arch/shark/shark/sequoia.c
diff -u src/sys/arch/shark/shark/sequoia.c:1.11 src/sys/arch/shark/shark/sequoia.c:1.12
--- src/sys/arch/shark/shark/sequoia.c:1.11 Tue Jan 5 13:20:29 2010
+++ src/sys/arch/shark/shark/sequoia.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sequoia.c,v 1.11 2010/01/05 13:20:29 mbalmer Exp $ */
+/* $NetBSD: sequoia.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.11 2010/01/05 13:20:29 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/callout.h>
#include <sys/syslog.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/time.h>
#include <sys/kernel.h>
Added files:
Index: src/sys/arch/shark/include/bus_defs.h
diff -u /dev/null src/sys/arch/shark/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:07:44 2011
+++ src/sys/arch/shark/include/bus_defs.h Tue Jul 19 15:07:42 2011
@@ -0,0 +1,6 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:07:42 dyoung Exp $ */
+
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#include <arm/bus_defs.h>
+
Index: src/sys/arch/shark/include/bus_funcs.h
diff -u /dev/null src/sys/arch/shark/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:07:44 2011
+++ src/sys/arch/shark/include/bus_funcs.h Tue Jul 19 15:07:42 2011
@@ -0,0 +1,6 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:07:42 dyoung Exp $ */
+
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#include <arm/bus_funcs.h>
+
