Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:19:51 UTC 2011
Modified Files:
src/sys/arch/alpha/pci: agp_machdep.c apecs_bus_io.c apecs_bus_mem.c
apecs_dma.c cia_bwx_bus_io.c cia_bwx_bus_mem.c cia_dma.c
cia_swiz_bus_io.c cia_swiz_bus_mem.c dwlpx_bus_io.c dwlpx_bus_mem.c
dwlpx_dma.c irongate_bus_io.c irongate_bus_mem.c irongate_dma.c
lca_bus_io.c lca_bus_mem.c lca_dma.c mcpcia_bus_io.c
mcpcia_bus_mem.c mcpcia_dma.c pci_2100_a50.c pci_6600.c
pci_axppci_33.c pci_sgmap_pte32.c pci_sgmap_pte64.c pci_up1000.c
sio.c sio_pic.c tsp_bus_io.c tsp_bus_mem.c tsp_dma.c
ttwoga_bus_io.c ttwoga_bus_mem.c ttwoga_dma.c
src/sys/arch/alpha/sableio: com_sableio.c fdc_sableio.c lpt_sableio.c
src/sys/arch/alpha/tc: ioasic.c mcclock_ioasic.c tc_bus_mem.c tc_dma.c
tc_dma_3000_300.c tc_dma_3000_500.c tc_sgmap.c
src/sys/arch/alpha/tlsb: gbusvar.h mcclock_tlsb.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/pci/agp_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/pci/apecs_bus_io.c \
src/sys/arch/alpha/pci/apecs_bus_mem.c \
src/sys/arch/alpha/pci/lca_bus_io.c src/sys/arch/alpha/pci/lca_bus_mem.c \
src/sys/arch/alpha/pci/tsp_bus_mem.c src/sys/arch/alpha/pci/tsp_dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/pci/apecs_dma.c \
src/sys/arch/alpha/pci/mcpcia_dma.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/pci/cia_bwx_bus_io.c \
src/sys/arch/alpha/pci/cia_bwx_bus_mem.c \
src/sys/arch/alpha/pci/mcpcia_bus_io.c \
src/sys/arch/alpha/pci/mcpcia_bus_mem.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/pci/cia_dma.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/pci/cia_swiz_bus_io.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/pci/cia_swiz_bus_mem.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/pci/dwlpx_bus_io.c \
src/sys/arch/alpha/pci/dwlpx_bus_mem.c \
src/sys/arch/alpha/pci/pci_up1000.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/pci/dwlpx_dma.c \
src/sys/arch/alpha/pci/lca_dma.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/pci/irongate_bus_io.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/pci/irongate_bus_mem.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/pci/irongate_dma.c \
src/sys/arch/alpha/pci/ttwoga_dma.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/pci/pci_2100_a50.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/pci/pci_6600.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/alpha/pci/pci_axppci_33.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/pci/pci_sgmap_pte32.c \
src/sys/arch/alpha/pci/pci_sgmap_pte64.c \
src/sys/arch/alpha/pci/tsp_bus_io.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/alpha/pci/sio.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/pci/sio_pic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/pci/ttwoga_bus_io.c \
src/sys/arch/alpha/pci/ttwoga_bus_mem.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/sableio/com_sableio.c \
src/sys/arch/alpha/sableio/fdc_sableio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/sableio/lpt_sableio.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/tc/ioasic.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/tc/mcclock_ioasic.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/tc/tc_bus_mem.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/tc/tc_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/tc/tc_dma_3000_300.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/tc/tc_dma_3000_500.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/tc/tc_sgmap.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/tlsb/gbusvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/tlsb/mcclock_tlsb.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/alpha/pci/agp_machdep.c
diff -u src/sys/arch/alpha/pci/agp_machdep.c:1.3 src/sys/arch/alpha/pci/agp_machdep.c:1.4
--- src/sys/arch/alpha/pci/agp_machdep.c:1.3 Sun Dec 11 12:16:17 2005
+++ src/sys/arch/alpha/pci/agp_machdep.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_machdep.c,v 1.3 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: agp_machdep.c,v 1.4 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.3 2005/12/11 12:16:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.4 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/device.h>
#include <machine/alpha_cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/alpha/pci/apecs_bus_io.c
diff -u src/sys/arch/alpha/pci/apecs_bus_io.c:1.10 src/sys/arch/alpha/pci/apecs_bus_io.c:1.11
--- src/sys/arch/alpha/pci/apecs_bus_io.c:1.10 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/apecs_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_bus_io.c,v 1.10 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: apecs_bus_io.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: apecs_bus_io.c,v 1.10 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: apecs_bus_io.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
Index: src/sys/arch/alpha/pci/apecs_bus_mem.c
diff -u src/sys/arch/alpha/pci/apecs_bus_mem.c:1.10 src/sys/arch/alpha/pci/apecs_bus_mem.c:1.11
--- src/sys/arch/alpha/pci/apecs_bus_mem.c:1.10 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/apecs_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_bus_mem.c,v 1.10 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: apecs_bus_mem.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: apecs_bus_mem.c,v 1.10 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: apecs_bus_mem.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
Index: src/sys/arch/alpha/pci/lca_bus_io.c
diff -u src/sys/arch/alpha/pci/lca_bus_io.c:1.10 src/sys/arch/alpha/pci/lca_bus_io.c:1.11
--- src/sys/arch/alpha/pci/lca_bus_io.c:1.10 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/lca_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_bus_io.c,v 1.10 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: lca_bus_io.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: lca_bus_io.c,v 1.10 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: lca_bus_io.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
Index: src/sys/arch/alpha/pci/lca_bus_mem.c
diff -u src/sys/arch/alpha/pci/lca_bus_mem.c:1.10 src/sys/arch/alpha/pci/lca_bus_mem.c:1.11
--- src/sys/arch/alpha/pci/lca_bus_mem.c:1.10 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/lca_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_bus_mem.c,v 1.10 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: lca_bus_mem.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: lca_bus_mem.c,v 1.10 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: lca_bus_mem.c,v 1.11 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
Index: src/sys/arch/alpha/pci/tsp_bus_mem.c
diff -u src/sys/arch/alpha/pci/tsp_bus_mem.c:1.10 src/sys/arch/alpha/pci/tsp_bus_mem.c:1.11
--- src/sys/arch/alpha/pci/tsp_bus_mem.c:1.10 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/tsp_bus_mem.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_mem.c,v 1.10 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: tsp_bus_mem.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_bus_mem.c,v 1.10 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_bus_mem.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
Index: src/sys/arch/alpha/pci/tsp_dma.c
diff -u src/sys/arch/alpha/pci/tsp_dma.c:1.10 src/sys/arch/alpha/pci/tsp_dma.c:1.11
--- src/sys/arch/alpha/pci/tsp_dma.c:1.10 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/tsp_dma.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.10 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.10 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
#include <machine/autoconf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/alpha/pci/apecs_dma.c
diff -u src/sys/arch/alpha/pci/apecs_dma.c:1.19 src/sys/arch/alpha/pci/apecs_dma.c:1.20
--- src/sys/arch/alpha/pci/apecs_dma.c:1.19 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/apecs_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.19 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.20 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.19 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.20 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/mcpcia_dma.c
diff -u src/sys/arch/alpha/pci/mcpcia_dma.c:1.19 src/sys/arch/alpha/pci/mcpcia_dma.c:1.20
--- src/sys/arch/alpha/pci/mcpcia_dma.c:1.19 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/mcpcia_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.19 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.20 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.19 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.20 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/cia_bwx_bus_io.c
diff -u src/sys/arch/alpha/pci/cia_bwx_bus_io.c:1.4 src/sys/arch/alpha/pci/cia_bwx_bus_io.c:1.5
--- src/sys/arch/alpha/pci/cia_bwx_bus_io.c:1.4 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/cia_bwx_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_bwx_bus_io.c,v 1.4 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia_bwx_bus_io.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_io.c,v 1.4 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_io.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: src/sys/arch/alpha/pci/cia_bwx_bus_mem.c
diff -u src/sys/arch/alpha/pci/cia_bwx_bus_mem.c:1.4 src/sys/arch/alpha/pci/cia_bwx_bus_mem.c:1.5
--- src/sys/arch/alpha/pci/cia_bwx_bus_mem.c:1.4 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/cia_bwx_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_bwx_bus_mem.c,v 1.4 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia_bwx_bus_mem.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_mem.c,v 1.4 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_mem.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: src/sys/arch/alpha/pci/mcpcia_bus_io.c
diff -u src/sys/arch/alpha/pci/mcpcia_bus_io.c:1.4 src/sys/arch/alpha/pci/mcpcia_bus_io.c:1.5
--- src/sys/arch/alpha/pci/mcpcia_bus_io.c:1.4 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/mcpcia_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_bus_io.c,v 1.4 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: mcpcia_bus_io.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_io.c,v 1.4 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_io.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/mcpciareg.h>
#include <alpha/pci/mcpciavar.h>
Index: src/sys/arch/alpha/pci/mcpcia_bus_mem.c
diff -u src/sys/arch/alpha/pci/mcpcia_bus_mem.c:1.4 src/sys/arch/alpha/pci/mcpcia_bus_mem.c:1.5
--- src/sys/arch/alpha/pci/mcpcia_bus_mem.c:1.4 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/mcpcia_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_bus_mem.c,v 1.4 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: mcpcia_bus_mem.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_mem.c,v 1.4 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_mem.c,v 1.5 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/mcpciareg.h>
#include <alpha/pci/mcpciavar.h>
Index: src/sys/arch/alpha/pci/cia_dma.c
diff -u src/sys/arch/alpha/pci/cia_dma.c:1.26 src/sys/arch/alpha/pci/cia_dma.c:1.27
--- src/sys/arch/alpha/pci/cia_dma.c:1.26 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/cia_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.26 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia_dma.c,v 1.27 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.26 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.27 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/cia_swiz_bus_io.c
diff -u src/sys/arch/alpha/pci/cia_swiz_bus_io.c:1.16 src/sys/arch/alpha/pci/cia_swiz_bus_io.c:1.17
--- src/sys/arch/alpha/pci/cia_swiz_bus_io.c:1.16 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/cia_swiz_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_swiz_bus_io.c,v 1.16 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia_swiz_bus_io.c,v 1.17 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_io.c,v 1.16 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_io.c,v 1.17 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: src/sys/arch/alpha/pci/cia_swiz_bus_mem.c
diff -u src/sys/arch/alpha/pci/cia_swiz_bus_mem.c:1.17 src/sys/arch/alpha/pci/cia_swiz_bus_mem.c:1.18
--- src/sys/arch/alpha/pci/cia_swiz_bus_mem.c:1.17 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/cia_swiz_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_swiz_bus_mem.c,v 1.17 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia_swiz_bus_mem.c,v 1.18 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_mem.c,v 1.17 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_mem.c,v 1.18 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: src/sys/arch/alpha/pci/dwlpx_bus_io.c
diff -u src/sys/arch/alpha/pci/dwlpx_bus_io.c:1.13 src/sys/arch/alpha/pci/dwlpx_bus_io.c:1.14
--- src/sys/arch/alpha/pci/dwlpx_bus_io.c:1.13 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/dwlpx_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_bus_io.c,v 1.13 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: dwlpx_bus_io.c,v 1.14 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_io.c,v 1.13 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_io.c,v 1.14 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/dwlpxreg.h>
#include <alpha/pci/dwlpxvar.h>
Index: src/sys/arch/alpha/pci/dwlpx_bus_mem.c
diff -u src/sys/arch/alpha/pci/dwlpx_bus_mem.c:1.13 src/sys/arch/alpha/pci/dwlpx_bus_mem.c:1.14
--- src/sys/arch/alpha/pci/dwlpx_bus_mem.c:1.13 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/dwlpx_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_bus_mem.c,v 1.13 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: dwlpx_bus_mem.c,v 1.14 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_mem.c,v 1.13 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_mem.c,v 1.14 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/dwlpxreg.h>
#include <alpha/pci/dwlpxvar.h>
Index: src/sys/arch/alpha/pci/pci_up1000.c
diff -u src/sys/arch/alpha/pci/pci_up1000.c:1.13 src/sys/arch/alpha/pci/pci_up1000.c:1.14
--- src/sys/arch/alpha/pci/pci_up1000.c:1.13 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/pci/pci_up1000.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_up1000.c,v 1.13 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: pci_up1000.c,v 1.14 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_up1000.c,v 1.13 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_up1000.c,v 1.14 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -41,7 +41,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/alpha/pci/dwlpx_dma.c
diff -u src/sys/arch/alpha/pci/dwlpx_dma.c:1.21 src/sys/arch/alpha/pci/dwlpx_dma.c:1.22
--- src/sys/arch/alpha/pci/dwlpx_dma.c:1.21 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/pci/dwlpx_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.21 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.22 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.21 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.22 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/lca_dma.c
diff -u src/sys/arch/alpha/pci/lca_dma.c:1.21 src/sys/arch/alpha/pci/lca_dma.c:1.22
--- src/sys/arch/alpha/pci/lca_dma.c:1.21 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/lca_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.21 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: lca_dma.c,v 1.22 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.21 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.22 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/irongate_bus_io.c
diff -u src/sys/arch/alpha/pci/irongate_bus_io.c:1.6 src/sys/arch/alpha/pci/irongate_bus_io.c:1.7
--- src/sys/arch/alpha/pci/irongate_bus_io.c:1.6 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/irongate_bus_io.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_bus_io.c,v 1.6 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: irongate_bus_io.c,v 1.7 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: irongate_bus_io.c,v 1.6 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: irongate_bus_io.c,v 1.7 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
Index: src/sys/arch/alpha/pci/irongate_bus_mem.c
diff -u src/sys/arch/alpha/pci/irongate_bus_mem.c:1.9 src/sys/arch/alpha/pci/irongate_bus_mem.c:1.10
--- src/sys/arch/alpha/pci/irongate_bus_mem.c:1.9 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/irongate_bus_mem.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_bus_mem.c,v 1.9 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: irongate_bus_mem.c,v 1.10 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: irongate_bus_mem.c,v 1.9 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: irongate_bus_mem.c,v 1.10 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
Index: src/sys/arch/alpha/pci/irongate_dma.c
diff -u src/sys/arch/alpha/pci/irongate_dma.c:1.5 src/sys/arch/alpha/pci/irongate_dma.c:1.6
--- src/sys/arch/alpha/pci/irongate_dma.c:1.5 Wed Dec 15 01:27:18 2010
+++ src/sys/arch/alpha/pci/irongate_dma.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_dma.c,v 1.5 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.5 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/ttwoga_dma.c
diff -u src/sys/arch/alpha/pci/ttwoga_dma.c:1.5 src/sys/arch/alpha/pci/ttwoga_dma.c:1.6
--- src/sys/arch/alpha/pci/ttwoga_dma.c:1.5 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/ttwoga_dma.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_dma.c,v 1.5 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: ttwoga_dma.c,v 1.6 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.5 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.6 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/pci_2100_a50.c
diff -u src/sys/arch/alpha/pci/pci_2100_a50.c:1.38 src/sys/arch/alpha/pci/pci_2100_a50.c:1.39
--- src/sys/arch/alpha/pci/pci_2100_a50.c:1.38 Mon Apr 4 20:37:44 2011
+++ src/sys/arch/alpha/pci/pci_2100_a50.c Fri Jul 1 19:19:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.38 2011/04/04 20:37:44 dyoung Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.39 2011/07/01 19:19:49 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.38 2011/04/04 20:37:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.39 2011/07/01 19:19:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/alpha/pci/pci_6600.c
diff -u src/sys/arch/alpha/pci/pci_6600.c:1.22 src/sys/arch/alpha/pci/pci_6600.c:1.23
--- src/sys/arch/alpha/pci/pci_6600.c:1.22 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/pci/pci_6600.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_6600.c,v 1.22 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: pci_6600.c,v 1.23 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.22 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.23 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <machine/autoconf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <machine/alpha.h>
Index: src/sys/arch/alpha/pci/pci_axppci_33.c
diff -u src/sys/arch/alpha/pci/pci_axppci_33.c:1.35 src/sys/arch/alpha/pci/pci_axppci_33.c:1.36
--- src/sys/arch/alpha/pci/pci_axppci_33.c:1.35 Mon Apr 4 20:37:44 2011
+++ src/sys/arch/alpha/pci/pci_axppci_33.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.35 2011/04/04 20:37:44 dyoung Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.36 2011/07/01 19:19:50 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.35 2011/04/04 20:37:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.36 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/alpha/pci/pci_sgmap_pte32.c
diff -u src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.7 src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.8
--- src/sys/arch/alpha/pci/pci_sgmap_pte32.c:1.7 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/pci_sgmap_pte32.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte32.c,v 1.7 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: pci_sgmap_pte32.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.7 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte32.h>
Index: src/sys/arch/alpha/pci/pci_sgmap_pte64.c
diff -u src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.7 src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.8
--- src/sys/arch/alpha/pci/pci_sgmap_pte64.c:1.7 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/pci_sgmap_pte64.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte64.c,v 1.7 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: pci_sgmap_pte64.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.7 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte64.h>
Index: src/sys/arch/alpha/pci/tsp_bus_io.c
diff -u src/sys/arch/alpha/pci/tsp_bus_io.c:1.7 src/sys/arch/alpha/pci/tsp_bus_io.c:1.8
--- src/sys/arch/alpha/pci/tsp_bus_io.c:1.7 Wed Dec 15 01:27:19 2010
+++ src/sys/arch/alpha/pci/tsp_bus_io.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_io.c,v 1.7 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: tsp_bus_io.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: tsp_bus_io.c,v 1.7 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tsp_bus_io.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
Index: src/sys/arch/alpha/pci/sio.c
diff -u src/sys/arch/alpha/pci/sio.c:1.50 src/sys/arch/alpha/pci/sio.c:1.51
--- src/sys/arch/alpha/pci/sio.c:1.50 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/pci/sio.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.50 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: sio.c,v 1.51 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.50 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.51 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/alpha/pci/sio_pic.c
diff -u src/sys/arch/alpha/pci/sio_pic.c:1.40 src/sys/arch/alpha/pci/sio_pic.c:1.41
--- src/sys/arch/alpha/pci/sio_pic.c:1.40 Mon Mar 16 23:11:09 2009
+++ src/sys/arch/alpha/pci/sio_pic.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sio_pic.c,v 1.40 2009/03/16 23:11:09 dsl Exp $ */
+/* $NetBSD: sio_pic.c,v 1.41 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.40 2009/03/16 23:11:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.41 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@
#include <sys/syslog.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/alpha/pci/ttwoga_bus_io.c
diff -u src/sys/arch/alpha/pci/ttwoga_bus_io.c:1.2 src/sys/arch/alpha/pci/ttwoga_bus_io.c:1.3
--- src/sys/arch/alpha/pci/ttwoga_bus_io.c:1.2 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/pci/ttwoga_bus_io.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_bus_io.c,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: ttwoga_bus_io.c,v 1.3 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_io.c,v 1.2 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_io.c,v 1.3 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ttwogareg.h>
#include <alpha/pci/ttwogavar.h>
Index: src/sys/arch/alpha/pci/ttwoga_bus_mem.c
diff -u src/sys/arch/alpha/pci/ttwoga_bus_mem.c:1.2 src/sys/arch/alpha/pci/ttwoga_bus_mem.c:1.3
--- src/sys/arch/alpha/pci/ttwoga_bus_mem.c:1.2 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/pci/ttwoga_bus_mem.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_bus_mem.c,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: ttwoga_bus_mem.c,v 1.3 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_mem.c,v 1.2 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_mem.c,v 1.3 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ttwogareg.h>
#include <alpha/pci/ttwogavar.h>
Index: src/sys/arch/alpha/sableio/com_sableio.c
diff -u src/sys/arch/alpha/sableio/com_sableio.c:1.10 src/sys/arch/alpha/sableio/com_sableio.c:1.11
--- src/sys/arch/alpha/sableio/com_sableio.c:1.10 Fri Dec 4 11:13:04 2009
+++ src/sys/arch/alpha/sableio/com_sableio.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $ */
+/* $NetBSD: com_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/sableio/fdc_sableio.c
diff -u src/sys/arch/alpha/sableio/fdc_sableio.c:1.10 src/sys/arch/alpha/sableio/fdc_sableio.c:1.11
--- src/sys/arch/alpha/sableio/fdc_sableio.c:1.10 Fri Dec 4 11:13:04 2009
+++ src/sys/arch/alpha/sableio/fdc_sableio.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $ */
+/* $NetBSD: fdc_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/alpha/sableio/lpt_sableio.c
diff -u src/sys/arch/alpha/sableio/lpt_sableio.c:1.7 src/sys/arch/alpha/sableio/lpt_sableio.c:1.8
--- src/sys/arch/alpha/sableio/lpt_sableio.c:1.7 Sat Nov 21 05:35:41 2009
+++ src/sys/arch/alpha/sableio/lpt_sableio.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_sableio.c,v 1.7 2009/11/21 05:35:41 rmind Exp $ */
+/* $NetBSD: lpt_sableio.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lpt_sableio.c,v 1.7 2009/11/21 05:35:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_sableio.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: src/sys/arch/alpha/tc/ioasic.c
diff -u src/sys/arch/alpha/tc/ioasic.c:1.43 src/sys/arch/alpha/tc/ioasic.c:1.44
--- src/sys/arch/alpha/tc/ioasic.c:1.43 Sat Jun 4 01:49:43 2011
+++ src/sys/arch/alpha/tc/ioasic.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.43 2011/06/04 01:49:43 tsutsui Exp $ */
+/* $NetBSD: ioasic.c,v 1.44 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.43 2011/06/04 01:49:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.44 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -70,7 +70,7 @@
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pte.h>
#include <machine/rpb.h>
Index: src/sys/arch/alpha/tc/mcclock_ioasic.c
diff -u src/sys/arch/alpha/tc/mcclock_ioasic.c:1.15 src/sys/arch/alpha/tc/mcclock_ioasic.c:1.16
--- src/sys/arch/alpha/tc/mcclock_ioasic.c:1.15 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/alpha/tc/mcclock_ioasic.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ioasic.c,v 1.15 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_ioasic.c,v 1.16 2011/07/01 19:19:50 dyoung Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.15 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.16 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
Index: src/sys/arch/alpha/tc/tc_bus_mem.c
diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.31 src/sys/arch/alpha/tc/tc_bus_mem.c:1.32
--- src/sys/arch/alpha/tc/tc_bus_mem.c:1.31 Wed Dec 15 01:29:37 2010
+++ src/sys/arch/alpha/tc/tc_bus_mem.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.32 2011/07/01 19:19:50 dyoung Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.32 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#define __C(A,B) __CONCAT(A,B)
Index: src/sys/arch/alpha/tc/tc_dma.c
diff -u src/sys/arch/alpha/tc/tc_dma.c:1.12 src/sys/arch/alpha/tc/tc_dma.c:1.13
--- src/sys/arch/alpha/tc/tc_dma.c:1.12 Wed Mar 18 10:22:23 2009
+++ src/sys/arch/alpha/tc/tc_dma.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma.c,v 1.12 2009/03/18 10:22:23 cegger Exp $ */
+/* $NetBSD: tc_dma.c,v 1.13 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,13 +32,13 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1.12 2009/03/18 10:22:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1.13 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
Index: src/sys/arch/alpha/tc/tc_dma_3000_300.c
diff -u src/sys/arch/alpha/tc/tc_dma_3000_300.c:1.5 src/sys/arch/alpha/tc/tc_dma_3000_300.c:1.6
--- src/sys/arch/alpha/tc/tc_dma_3000_300.c:1.5 Sat Mar 14 15:36:00 2009
+++ src/sys/arch/alpha/tc/tc_dma_3000_300.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_300.c,v 1.5 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: tc_dma_3000_300.c,v 1.6 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,11 +32,11 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_300.c,v 1.5 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_300.c,v 1.6 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tc/tc_dma_3000_300.h>
Index: src/sys/arch/alpha/tc/tc_dma_3000_500.c
diff -u src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.16 src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.17
--- src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.16 Wed Dec 15 01:29:38 2010
+++ src/sys/arch/alpha/tc/tc_dma_3000_500.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.16 2010/12/15 01:29:38 matt Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.17 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.16 2010/12/15 01:29:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.17 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#include <alpha/tc/tc_sgmap.h>
Index: src/sys/arch/alpha/tc/tc_sgmap.c
diff -u src/sys/arch/alpha/tc/tc_sgmap.c:1.7 src/sys/arch/alpha/tc/tc_sgmap.c:1.8
--- src/sys/arch/alpha/tc/tc_sgmap.c:1.7 Wed Dec 15 01:29:38 2010
+++ src/sys/arch/alpha/tc/tc_sgmap.c Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_sgmap.c,v 1.7 2010/12/15 01:29:38 matt Exp $ */
+/* $NetBSD: tc_sgmap.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.7 2010/12/15 01:29:38 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v 1.8 2011/07/01 19:19:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tc/tc_sgmap.h>
Index: src/sys/arch/alpha/tlsb/gbusvar.h
diff -u src/sys/arch/alpha/tlsb/gbusvar.h:1.2 src/sys/arch/alpha/tlsb/gbusvar.h:1.3
--- src/sys/arch/alpha/tlsb/gbusvar.h:1.2 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/alpha/tlsb/gbusvar.h Fri Jul 1 19:19:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gbusvar.h,v 1.2 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: gbusvar.h,v 1.3 2011/07/01 19:19:50 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
* Autoconfiguration definitions for the Gbus found on TurboLaser CPU modules.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct gbus_attach_args {
const char *ga_name; /* name of device */
Index: src/sys/arch/alpha/tlsb/mcclock_tlsb.c
diff -u src/sys/arch/alpha/tlsb/mcclock_tlsb.c:1.16 src/sys/arch/alpha/tlsb/mcclock_tlsb.c:1.17
--- src/sys/arch/alpha/tlsb/mcclock_tlsb.c:1.16 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/alpha/tlsb/mcclock_tlsb.c Fri Jul 1 19:19:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_tlsb.c,v 1.16 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_tlsb.c,v 1.17 2011/07/01 19:19:51 dyoung Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,14 +32,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_tlsb.c,v 1.16 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_tlsb.c,v 1.17 2011/07/01 19:19:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tlsb/gbusvar.h>
