Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:22:39 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c acpi_wakeup.c
src/sys/arch/x86/include: isa_machdep.h mpconfig.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/acpi/acpi_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/include/isa_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/mpconfig.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/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.1 src/sys/arch/x86/acpi/acpi_machdep.c:1.2
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.1 Sun Jun 12 11:31:31 2011
+++ src/sys/arch/x86/acpi/acpi_machdep.c Fri Jul 1 18:22:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,15 +40,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
#include <machine/cpufunc.h>
#include <dev/acpi/acpica.h>
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.28 src/sys/arch/x86/acpi/acpi_wakeup.c:1.29
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.28 Wed Feb 16 18:55:50 2011
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Fri Jul 1 18:22:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <[email protected]>
@@ -64,7 +64,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
Index: src/sys/arch/x86/include/isa_machdep.h
diff -u src/sys/arch/x86/include/isa_machdep.h:1.10 src/sys/arch/x86/include/isa_machdep.h:1.11
--- src/sys/arch/x86/include/isa_machdep.h:1.10 Wed Aug 19 15:04:27 2009
+++ src/sys/arch/x86/include/isa_machdep.h Fri Jul 1 18:22:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 15:04:27 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2011/07/01 18:22:39 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#ifndef _X86_ISA_MACHDEP_H_ /* XXX */
#define _X86_ISA_MACHDEP_H_ /* XXX */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/x86/include/mpconfig.h
diff -u src/sys/arch/x86/include/mpconfig.h:1.12 src/sys/arch/x86/include/mpconfig.h:1.13
--- src/sys/arch/x86/include/mpconfig.h:1.12 Sat Jan 9 20:56:17 2010
+++ src/sys/arch/x86/include/mpconfig.h Fri Jul 1 18:22:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpconfig.h,v 1.12 2010/01/09 20:56:17 cegger Exp $ */
+/* $NetBSD: mpconfig.h,v 1.13 2011/07/01 18:22:39 dyoung Exp $ */
/*
* Definitions originally from the mpbios code, but now used for ACPI
@@ -11,7 +11,7 @@
/*
* XXX
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <machine/pci_machdep.h>
