Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:14:15 UTC 2011
Modified Files:
src/sys/arch/i386/acpi: npx_acpi.c
src/sys/arch/i386/eisa: eisa_machdep.c
src/sys/arch/i386/i386: genassym.cf machdep.c rbus_machdep.c
src/sys/arch/i386/mca: mca_machdep.c
src/sys/arch/i386/pnpbios: atppc_pnpbios.c com_pnpbios.c ess_pnpbios.c
fdc_pnpbios.c joy_pnpbios.c lm_pnpbios.c lpt_pnpbios.c
npx_pnpbios.c pciide_pnpbios.c sb_pnpbios.c wss_pnpbios.c
ym_pnpbios.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/acpi/npx_acpi.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.705 -r1.706 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/rbus_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/mca/mca_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pnpbios/atppc_pnpbios.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pnpbios/com_pnpbios.c \
src/sys/arch/i386/pnpbios/lm_pnpbios.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/pnpbios/ess_pnpbios.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/pnpbios/fdc_pnpbios.c \
src/sys/arch/i386/pnpbios/sb_pnpbios.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pnpbios/joy_pnpbios.c \
src/sys/arch/i386/pnpbios/npx_pnpbios.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/pnpbios/lpt_pnpbios.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/pnpbios/wss_pnpbios.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/pnpbios/ym_pnpbios.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/i386/acpi/npx_acpi.c
diff -u src/sys/arch/i386/acpi/npx_acpi.c:1.18 src/sys/arch/i386/acpi/npx_acpi.c:1.19
--- src/sys/arch/i386/acpi/npx_acpi.c:1.18 Sat Feb 21 00:30:37 2009
+++ src/sys/arch/i386/acpi/npx_acpi.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $ */
+/* $NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,13 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
Index: src/sys/arch/i386/eisa/eisa_machdep.c
diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.34 src/sys/arch/i386/eisa/eisa_machdep.c:1.35
--- src/sys/arch/i386/eisa/eisa_machdep.c:1.34 Tue Nov 17 23:51:59 2009
+++ src/sys/arch/i386/eisa/eisa_machdep.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $");
#include "ioapic.h"
@@ -76,7 +76,7 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.89 src/sys/arch/i386/i386/genassym.cf:1.90
--- src/sys/arch/i386/i386/genassym.cf:1.89 Sun Jun 12 03:35:41 2011
+++ src/sys/arch/i386/i386/genassym.cf Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.89 2011/06/12 03:35:41 rmind Exp $
+# $NetBSD: genassym.cf,v 1.90 2011/07/01 18:14:15 dyoung Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@
include <machine/tlog.h>
-include <x86/bus.h>
+include <sys/bus.h>
define PAGE_SIZE PAGE_SIZE
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.705 src/sys/arch/i386/i386/machdep.c:1.706
--- src/sys/arch/i386/i386/machdep.c:1.705 Thu Jun 30 23:28:03 2011
+++ src/sys/arch/i386/i386/machdep.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -212,7 +212,7 @@
#include "cardbus.h"
#if NCARDBUS > 0
/* For rbus_min_start hint. */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <machine/rbus_machdep.h>
#endif
Index: src/sys/arch/i386/i386/rbus_machdep.c
diff -u src/sys/arch/i386/i386/rbus_machdep.c:1.25 src/sys/arch/i386/i386/rbus_machdep.c:1.26
--- src/sys/arch/i386/i386/rbus_machdep.c:1.25 Mon Mar 1 01:15:24 2010
+++ src/sys/arch/i386/i386/rbus_machdep.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_machdep.c,v 1.25 2010/03/01 01:15:24 jym Exp $ */
+/* $NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.25 2010/03/01 01:15:24 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $");
#include "opt_pcibios.h"
#include "opt_pcifixup.h"
@@ -39,7 +39,7 @@
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <sys/device.h>
Index: src/sys/arch/i386/mca/mca_machdep.c
diff -u src/sys/arch/i386/mca/mca_machdep.c:1.40 src/sys/arch/i386/mca/mca_machdep.c:1.41
--- src/sys/arch/i386/mca/mca_machdep.c:1.40 Sun Apr 3 22:29:27 2011
+++ src/sys/arch/i386/mca/mca_machdep.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.40 2011/04/03 22:29:27 dyoung Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.41 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.40 2011/04/03 22:29:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.41 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -49,7 +49,7 @@
#include <machine/bioscall.h>
#include <machine/psl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <machine/pio.h>
Index: src/sys/arch/i386/pnpbios/atppc_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/atppc_pnpbios.c:1.8 src/sys/arch/i386/pnpbios/atppc_pnpbios.c:1.9
--- src/sys/arch/i386/pnpbios/atppc_pnpbios.c:1.8 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/atppc_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_pnpbios.c,v 1.8 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: atppc_pnpbios.c,v 1.9 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_pnpbios.c,v 1.8 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_pnpbios.c,v 1.9 2011/07/01 18:14:15 dyoung Exp $");
#include "opt_atppc.h"
@@ -43,7 +43,7 @@
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/com_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/com_pnpbios.c:1.14 src/sys/arch/i386/pnpbios/com_pnpbios.c:1.15
--- src/sys/arch/i386/pnpbios/com_pnpbios.c:1.14 Fri Mar 14 15:09:10 2008
+++ src/sys/arch/i386/pnpbios/com_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pnpbios.c,v 1.14 2008/03/14 15:09:10 cube Exp $ */
+/* $NetBSD: com_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pnpbios.c,v 1.14 2008/03/14 15:09:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/lm_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/lm_pnpbios.c:1.14 src/sys/arch/i386/pnpbios/lm_pnpbios.c:1.15
--- src/sys/arch/i386/pnpbios/lm_pnpbios.c:1.14 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/lm_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: lm_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.21 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.21 Sat May 22 16:35:00 2010
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_pnpbios.c,v 1.21 2010/05/22 16:35:00 tsutsui Exp $ */
+/* $NetBSD: ess_pnpbios.c,v 1.22 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.21 2010/05/22 16:35:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: src/sys/arch/i386/pnpbios/fdc_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.15 src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.16
--- src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.15 Wed Nov 25 13:15:17 2009
+++ src/sys/arch/i386/pnpbios/fdc_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pnpbios.c,v 1.15 2009/11/25 13:15:17 cube Exp $ */
+/* $NetBSD: fdc_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.15 2009/11/25 13:15:17 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $");
#include "rnd.h"
@@ -48,7 +48,7 @@
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/i386/pnpbios/sb_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.15 src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.16
--- src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.15 Mon Mar 17 13:38:25 2008
+++ src/sys/arch/i386/pnpbios/sb_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_pnpbios.c,v 1.15 2008/03/17 13:38:25 cube Exp $ */
+/* $NetBSD: sb_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.15 2008/03/17 13:38:25 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: src/sys/arch/i386/pnpbios/joy_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/joy_pnpbios.c:1.12 src/sys/arch/i386/pnpbios/joy_pnpbios.c:1.13
--- src/sys/arch/i386/pnpbios/joy_pnpbios.c:1.12 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/joy_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_pnpbios.c,v 1.12 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: joy_pnpbios.c,v 1.13 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pnpbios.c,v 1.12 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pnpbios.c,v 1.13 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/npx_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/npx_pnpbios.c:1.12 src/sys/arch/i386/pnpbios/npx_pnpbios.c:1.13
--- src/sys/arch/i386/pnpbios/npx_pnpbios.c:1.12 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/npx_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_pnpbios.c,v 1.12 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: npx_pnpbios.c,v 1.13 2011/07/01 18:14:15 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_pnpbios.c,v 1.12 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_pnpbios.c,v 1.13 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
Index: src/sys/arch/i386/pnpbios/lpt_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/lpt_pnpbios.c:1.11 src/sys/arch/i386/pnpbios/lpt_pnpbios.c:1.12
--- src/sys/arch/i386/pnpbios/lpt_pnpbios.c:1.11 Fri Mar 7 17:15:51 2008
+++ src/sys/arch/i386/pnpbios/lpt_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_pnpbios.c,v 1.11 2008/03/07 17:15:51 cube Exp $ */
+/* $NetBSD: lpt_pnpbios.c,v 1.12 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_pnpbios.c,v 1.11 2008/03/07 17:15:51 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_pnpbios.c,v 1.12 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/pciide_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.26 src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.27
--- src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.26 Wed Apr 16 22:15:17 2008
+++ src/sys/arch/i386/pnpbios/pciide_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pnpbios.c,v 1.26 2008/04/16 22:15:17 cegger Exp $ */
+/* $NetBSD: pciide_pnpbios.c,v 1.27 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang. All rights reserved.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.26 2008/04/16 22:15:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.27 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wdcreg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/i386/pnpbios/wss_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.19 src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.20
--- src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.19 Thu Jun 2 14:12:24 2011
+++ src/sys/arch/i386/pnpbios/wss_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_pnpbios.c,v 1.19 2011/06/02 14:12:24 tsutsui Exp $ */
+/* $NetBSD: wss_pnpbios.c,v 1.20 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.19 2011/06/02 14:12:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.20 2011/07/01 18:14:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: src/sys/arch/i386/pnpbios/ym_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.16 src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.17
--- src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.16 Thu Jun 2 14:12:24 2011
+++ src/sys/arch/i386/pnpbios/ym_pnpbios.c Fri Jul 1 18:14:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_pnpbios.c,v 1.16 2011/06/02 14:12:24 tsutsui Exp $ */
+/* $NetBSD: ym_pnpbios.c,v 1.17 2011/07/01 18:14:15 dyoung Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c,v 1.16 2011/06/02 14:12:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c,v 1.17 2011/07/01 18:14:15 dyoung Exp $");
#include "mpu_ym.h"
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
