Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:50:34 UTC 2011
Modified Files:
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/netwinder/pci: pcib.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/netwinder/pci/pcib.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/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.76
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.75 Thu Jun 30 20:09:34 2011
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Fri Jul 1 20:50:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.75 2011/06/30 20:09:34 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.76 2011/07/01 20:50:34 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -68,7 +68,7 @@
#include <machine/bootconfig.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: src/sys/arch/netwinder/pci/pcib.c
diff -u src/sys/arch/netwinder/pci/pcib.c:1.14 src/sys/arch/netwinder/pci/pcib.c:1.15
--- src/sys/arch/netwinder/pci/pcib.c:1.14 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/netwinder/pci/pcib.c Fri Jul 1 20:50:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,13 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.15 2011/07/01 20:50:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
