[src/netbsd-2-0]: src/sys/arch/amd64/amd64 Pull up revision 1.26 (requested b...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c90bbcc18082
branches:  netbsd-2-0
changeset: 561569:c90bbcc18082
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 08:45:39 2004 +0000

description:
Pull up revision 1.26 (requested by toshii in ticket #518):

diffstat:

 sys/arch/amd64/amd64/machdep.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r eb517c33b16a -r c90bbcc18082 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Tue Jun 22 08:00:54 2004 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Tue Jun 22 08:45:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.25 2004/03/28 15:46:14 drochner Exp $    */
+/*     $NetBSD: machdep.c,v 1.25.2.1 2004/06/22 08:45:39 tron Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2004/03/28 15:46:14 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25.2.1 2004/06/22 08:45:39 tron Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_ddb.h"
@@ -145,6 +145,14 @@
 #include <ddb/db_extern.h>
 #endif
 
+#include "acpi.h"
+
+#if NACPI > 0
+#include <dev/acpi/acpivar.h>
+#define ACPI_MACHDEP_PRIVATE
+#include <machine/acpi_machdep.h>
+#endif
+
 #include "isa.h"
 #include "isadma.h"
 #include "ksyms.h"