Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:12:53 UTC 2011
Modified Files:
src/sys/arch/landisk/dev: obio.c obiovar.h wdc_obio.c
src/sys/arch/landisk/landisk: bus_dma.c machdep.c mainbus.c
shpcic_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/landisk/dev/obio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/dev/obiovar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/dev/wdc_obio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/landisk/bus_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/landisk/landisk/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/landisk/mainbus.c \
src/sys/arch/landisk/landisk/shpcic_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/landisk/dev/obio.c
diff -u src/sys/arch/landisk/dev/obio.c:1.8 src/sys/arch/landisk/dev/obio.c:1.9
--- src/sys/arch/landisk/dev/obio.c:1.8 Sat Nov 7 07:27:45 2009
+++ src/sys/arch/landisk/dev/obio.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.8 2009/11/07 07:27:45 cegger Exp $ */
+/* $NetBSD: obio.c,v 1.9 2011/07/01 19:12:53 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.8 2009/11/07 07:27:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2011/07/01 19:12:53 dyoung Exp $");
#include "btn_obio.h"
#include "pwrsw_obio.h"
@@ -46,7 +46,7 @@
#include <sh3/pmap.h>
#include <sh3/pte.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
Index: src/sys/arch/landisk/dev/obiovar.h
diff -u src/sys/arch/landisk/dev/obiovar.h:1.3 src/sys/arch/landisk/dev/obiovar.h:1.4
--- src/sys/arch/landisk/dev/obiovar.h:1.3 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/landisk/dev/obiovar.h Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obiovar.h,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: obiovar.h,v 1.4 2011/07/01 19:12:53 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
#ifndef _LANDISK_OBIOVAR_H_
#define _LANDISK_OBIOVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/* obio tag */
extern struct _bus_space obio_bus_io;
Index: src/sys/arch/landisk/dev/wdc_obio.c
diff -u src/sys/arch/landisk/dev/wdc_obio.c:1.4 src/sys/arch/landisk/dev/wdc_obio.c:1.5
--- src/sys/arch/landisk/dev/wdc_obio.c:1.4 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/landisk/dev/wdc_obio.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.4 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.5 2011/07/01 19:12:53 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.4 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.5 2011/07/01 19:12:53 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ata/atavar.h>
Index: src/sys/arch/landisk/landisk/bus_dma.c
diff -u src/sys/arch/landisk/landisk/bus_dma.c:1.13 src/sys/arch/landisk/landisk/bus_dma.c:1.14
--- src/sys/arch/landisk/landisk/bus_dma.c:1.13 Sat Nov 6 11:46:01 2010
+++ src/sys/arch/landisk/landisk/bus_dma.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.13 2010/11/06 11:46:01 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $ */
/*
* Copyright (c) 2005 NONAKA Kimihiro
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13 2010/11/06 11:46:01 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <machine/autoconf.h>
#define _LANDISK_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined(DEBUG) && defined(BUSDMA_DEBUG)
int busdma_debug = 0;
Index: src/sys/arch/landisk/landisk/machdep.c
diff -u src/sys/arch/landisk/landisk/machdep.c:1.14 src/sys/arch/landisk/landisk/machdep.c:1.15
--- src/sys/arch/landisk/landisk/machdep.c:1.14 Tue Mar 2 17:28:08 2010
+++ src/sys/arch/landisk/landisk/machdep.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -101,7 +101,7 @@
#include <sh3/cache_sh4.h>
#include <sh3/mmu_sh4.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <landisk/landisk/landiskreg.h>
Index: src/sys/arch/landisk/landisk/mainbus.c
diff -u src/sys/arch/landisk/landisk/mainbus.c:1.3 src/sys/arch/landisk/landisk/mainbus.c:1.4
--- src/sys/arch/landisk/landisk/mainbus.c:1.3 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/landisk/landisk/mainbus.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: mainbus.c,v 1.4 2011/07/01 19:12:53 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/07/01 19:12:53 dyoung Exp $");
#include "obio.h"
#include "pci.h"
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <landisk/dev/obiovar.h>
Index: src/sys/arch/landisk/landisk/shpcic_machdep.c
diff -u src/sys/arch/landisk/landisk/shpcic_machdep.c:1.3 src/sys/arch/landisk/landisk/shpcic_machdep.c:1.4
--- src/sys/arch/landisk/landisk/shpcic_machdep.c:1.3 Wed Apr 6 01:32:06 2011
+++ src/sys/arch/landisk/landisk/shpcic_machdep.c Fri Jul 1 19:12:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shpcic_machdep.c,v 1.3 2011/04/06 01:32:06 dyoung Exp $ */
+/* $NetBSD: shpcic_machdep.c,v 1.4 2011/07/01 19:12:53 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.3 2011/04/06 01:32:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.4 2011/07/01 19:12:53 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,7 +52,7 @@
#include <dev/pci/pcidevs.h>
#include <dev/pci/pciconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pci_machdep.h>
