Module Name: src Committed By: dyoung Date: Fri Jul 1 18:41:52 UTC 2011
Modified Files: src/sys/arch/macppc/dev: adb.c am79c950.c battery.c com_mainbus.c cuda.c if_mc.c if_wi_obio.c kauai.c ofb.c pmu.c smartbat.c wdc_obio.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/dev/adb.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/dev/am79c950.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/dev/battery.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/com_mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/dev/cuda.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/dev/if_mc.c \ src/sys/arch/macppc/dev/pmu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/if_wi_obio.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/dev/kauai.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/dev/smartbat.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/dev/wdc_obio.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/macppc/dev/adb.c diff -u src/sys/arch/macppc/dev/adb.c:1.31 src/sys/arch/macppc/dev/adb.c:1.32 --- src/sys/arch/macppc/dev/adb.c:1.31 Thu Jun 30 00:52:57 2011 +++ src/sys/arch/macppc/dev/adb.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $ */ +/* $NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -37,7 +37,7 @@ #include <sys/signalvar.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/pio.h> Index: src/sys/arch/macppc/dev/am79c950.c diff -u src/sys/arch/macppc/dev/am79c950.c:1.30 src/sys/arch/macppc/dev/am79c950.c:1.31 --- src/sys/arch/macppc/dev/am79c950.c:1.30 Mon Dec 20 00:25:37 2010 +++ src/sys/arch/macppc/dev/am79c950.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $ */ +/* $NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (c) 1997 David Huang <k...@bga.com> @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $"); #include "opt_inet.h" @@ -66,7 +66,7 @@ #include <net/bpf.h> #include <net/bpfdesc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <macppc/dev/am79c950reg.h> #include <macppc/dev/if_mcvar.h> Index: src/sys/arch/macppc/dev/battery.c diff -u src/sys/arch/macppc/dev/battery.c:1.12 src/sys/arch/macppc/dev/battery.c:1.13 --- src/sys/arch/macppc/dev/battery.c:1.12 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/battery.c Fri Jul 1 18:41:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,7 +40,7 @@ #include <macppc/dev/pmuvar.h> #include <macppc/dev/batteryvar.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pio.h> #include "opt_battery.h" Index: src/sys/arch/macppc/dev/com_mainbus.c diff -u src/sys/arch/macppc/dev/com_mainbus.c:1.3 src/sys/arch/macppc/dev/com_mainbus.c:1.4 --- src/sys/arch/macppc/dev/com_mainbus.c:1.3 Fri Mar 14 15:09:10 2008 +++ src/sys/arch/macppc/dev/com_mainbus.c Fri Jul 1 18:41:52 2011 @@ -41,7 +41,7 @@ #include <sys/device.h> #include <sys/tty.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ofw/openfirm.h> #include <dev/ic/comreg.h> Index: src/sys/arch/macppc/dev/cuda.c diff -u src/sys/arch/macppc/dev/cuda.c:1.16 src/sys/arch/macppc/dev/cuda.c:1.17 --- src/sys/arch/macppc/dev/cuda.c:1.16 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/cuda.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,7 +36,7 @@ #include <sys/proc.h> #include <sys/mutex.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/pio.h> #include <dev/clock_subr.h> Index: src/sys/arch/macppc/dev/if_mc.c diff -u src/sys/arch/macppc/dev/if_mc.c:1.20 src/sys/arch/macppc/dev/if_mc.c:1.21 --- src/sys/arch/macppc/dev/if_mc.c:1.20 Thu Jun 30 00:52:57 2011 +++ src/sys/arch/macppc/dev/if_mc.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mc.c,v 1.20 2011/06/30 00:52:57 matt Exp $ */ +/* $NetBSD: if_mc.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 1997 David Huang <k...@bga.com> @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.20 2011/06/30 00:52:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -50,7 +50,7 @@ #include <dev/ofw/openfirm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/pio.h> Index: src/sys/arch/macppc/dev/pmu.c diff -u src/sys/arch/macppc/dev/pmu.c:1.20 src/sys/arch/macppc/dev/pmu.c:1.21 --- src/sys/arch/macppc/dev/pmu.c:1.20 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/pmu.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmu.c,v 1.20 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.20 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,7 +36,7 @@ #include <sys/proc.h> #include <sys/kthread.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pio.h> #include <machine/autoconf.h> #include <dev/clock_subr.h> Index: src/sys/arch/macppc/dev/if_wi_obio.c diff -u src/sys/arch/macppc/dev/if_wi_obio.c:1.22 src/sys/arch/macppc/dev/if_wi_obio.c:1.23 --- src/sys/arch/macppc/dev/if_wi_obio.c:1.22 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/if_wi_obio.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_obio.c,v 1.22 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: if_wi_obio.c,v 1.23 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2001 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.22 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.23 2011/07/01 18:41:52 dyoung Exp $"); #include "opt_inet.h" @@ -47,7 +47,7 @@ #endif #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/wi_ieee.h> #include <dev/ic/wireg.h> Index: src/sys/arch/macppc/dev/kauai.c diff -u src/sys/arch/macppc/dev/kauai.c:1.27 src/sys/arch/macppc/dev/kauai.c:1.28 --- src/sys/arch/macppc/dev/kauai.c:1.27 Wed Nov 18 22:51:07 2009 +++ src/sys/arch/macppc/dev/kauai.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kauai.c,v 1.27 2009/11/18 22:51:07 dyoung Exp $ */ +/* $NetBSD: kauai.c,v 1.28 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2003 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.27 2009/11/18 22:51:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.28 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,7 +36,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pio.h> #include <dev/ata/atareg.h> Index: src/sys/arch/macppc/dev/ofb.c diff -u src/sys/arch/macppc/dev/ofb.c:1.66 src/sys/arch/macppc/dev/ofb.c:1.67 --- src/sys/arch/macppc/dev/ofb.c:1.66 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/ofb.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofb.c,v 1.66 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: ofb.c,v 1.67 2011/07/01 18:41:52 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.66 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.67 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -54,7 +54,7 @@ #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_pci.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/grfioctl.h> Index: src/sys/arch/macppc/dev/smartbat.c diff -u src/sys/arch/macppc/dev/smartbat.c:1.5 src/sys/arch/macppc/dev/smartbat.c:1.6 --- src/sys/arch/macppc/dev/smartbat.c:1.5 Sat Jun 18 08:08:28 2011 +++ src/sys/arch/macppc/dev/smartbat.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: smartbat.c,v 1.5 2011/06/18 08:08:28 matt Exp $ */ +/* $NetBSD: smartbat.c,v 1.6 2011/07/01 18:41:52 dyoung Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smartbat.c,v 1.5 2011/06/18 08:08:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smartbat.c,v 1.6 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ #include <macppc/dev/pmuvar.h> #include <macppc/dev/batteryvar.h> -#include <machine/bus.h> +#include <sys/bus.h> #include "opt_battery.h" #ifdef SMARTBAT_DEBUG Index: src/sys/arch/macppc/dev/wdc_obio.c diff -u src/sys/arch/macppc/dev/wdc_obio.c:1.52 src/sys/arch/macppc/dev/wdc_obio.c:1.53 --- src/sys/arch/macppc/dev/wdc_obio.c:1.52 Wed Nov 18 22:51:07 2009 +++ src/sys/arch/macppc/dev/wdc_obio.c Fri Jul 1 18:41:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_obio.c,v 1.52 2009/11/18 22:51:07 dyoung Exp $ */ +/* $NetBSD: wdc_obio.c,v 1.53 2011/07/01 18:41:52 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.52 2009/11/18 22:51:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.53 2011/07/01 18:41:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/pio.h>