Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:16:42 UTC 2011
Modified Files:
src/sys/arch/sandpoint/isa: mcclock_isa.c
src/sys/arch/sandpoint/pci: pci_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/isa/mcclock_isa.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sandpoint/pci/pci_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/sandpoint/isa/mcclock_isa.c
diff -u src/sys/arch/sandpoint/isa/mcclock_isa.c:1.4 src/sys/arch/sandpoint/isa/mcclock_isa.c:1.5
--- src/sys/arch/sandpoint/isa/mcclock_isa.c:1.4 Sat Mar 29 05:42:46 2008
+++ src/sys/arch/sandpoint/isa/mcclock_isa.c Fri Jul 1 19:16:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:46 tsutsui Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.5 2011/07/01 19:16:41 dyoung Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.5 2011/07/01 19:16:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@
#include <sys/device.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.28 src/sys/arch/sandpoint/pci/pci_machdep.c:1.29
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.28 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/sandpoint/pci/pci_machdep.c Fri Jul 1 19:16:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.28 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.29 2011/07/01 19:16:41 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.28 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.29 2011/07/01 19:16:41 dyoung Exp $");
#include "opt_pci.h"
@@ -58,7 +58,7 @@
#include <sys/time.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
