Module Name: src
Committed By: dyoung
Date: Fri Jul 1 21:02:16 UTC 2011
Modified Files:
src/sys/arch/algor/include: autoconf.h
src/sys/arch/cobalt/include: autoconf.h
src/sys/arch/hp700/include: autoconf.h
src/sys/arch/macppc/include: autoconf.h
src/sys/arch/ofppc/include: autoconf.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/include/autoconf.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/cobalt/include/autoconf.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/include/autoconf.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/macppc/include/autoconf.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ofppc/include/autoconf.h
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/algor/include/autoconf.h
diff -u src/sys/arch/algor/include/autoconf.h:1.5 src/sys/arch/algor/include/autoconf.h:1.6
--- src/sys/arch/algor/include/autoconf.h:1.5 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.5 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
#ifndef _ALGOR_AUTOCONF_H_
#define _ALGOR_AUTOCONF_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Machine-dependent structures for autoconfiguration
Index: src/sys/arch/cobalt/include/autoconf.h
diff -u src/sys/arch/cobalt/include/autoconf.h:1.5 src/sys/arch/cobalt/include/autoconf.h:1.6
--- src/sys/arch/cobalt/include/autoconf.h:1.5 Thu Dec 17 15:29:47 2009
+++ src/sys/arch/cobalt/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.5 2009/12/17 15:29:47 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
const char *ma_name;
Index: src/sys/arch/hp700/include/autoconf.h
diff -u src/sys/arch/hp700/include/autoconf.h:1.18 src/sys/arch/hp700/include/autoconf.h:1.19
--- src/sys/arch/hp700/include/autoconf.h:1.18 Thu Jan 20 19:47:40 2011
+++ src/sys/arch/hp700/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.18 2011/01/20 19:47:40 skrll Exp $ */
+/* $NetBSD: autoconf.h,v 1.19 2011/07/01 21:02:15 dyoung Exp $ */
/* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */
@@ -30,7 +30,7 @@
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pdc.h>
/* 16 should be enough for anyone */
Index: src/sys/arch/macppc/include/autoconf.h
diff -u src/sys/arch/macppc/include/autoconf.h:1.17 src/sys/arch/macppc/include/autoconf.h:1.18
--- src/sys/arch/macppc/include/autoconf.h:1.17 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/macppc/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.17 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.18 2011/07/01 21:02:15 dyoung Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -34,7 +34,7 @@
#ifndef _MACHINE_AUTOCONF_H_
#define _MACHINE_AUTOCONF_H_
-#include <machine/bus.h> /* for bus_space_tag_t */
+#include <sys/bus.h> /* for bus_space_tag_t */
struct confargs {
const char *ca_name;
Index: src/sys/arch/ofppc/include/autoconf.h
diff -u src/sys/arch/ofppc/include/autoconf.h:1.14 src/sys/arch/ofppc/include/autoconf.h:1.15
--- src/sys/arch/ofppc/include/autoconf.h:1.14 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/ofppc/include/autoconf.h Fri Jul 1 21:02:15 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: autoconf.h,v 1.14 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: autoconf.h,v 1.15 2011/07/01 21:02:15 dyoung Exp $ */
#ifndef _OFPPC_AUTOCONF_H_
#define _OFPPC_AUTOCONF_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct confargs {
const char *ca_name;
