[src/trunk]: src/sys/arch/ia64/ia64 Switch to ACPICA 20090730, and update for...

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

details:   https://anonhg.NetBSD.org/src/rev/0a0a34029049
branches:  trunk
changeset: 751049:0a0a34029049
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sat Jan 23 06:13:20 2010 +0000

description:
Switch to ACPICA 20090730, and update for API changes.

diffstat:

 sys/arch/ia64/ia64/mainbus.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 23c22f8302a1 -r 0a0a34029049 sys/arch/ia64/ia64/mainbus.c
--- a/sys/arch/ia64/ia64/mainbus.c      Sat Jan 23 01:32:06 2010 +0000
+++ b/sys/arch/ia64/ia64/mainbus.c      Sat Jan 23 06:13:20 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $     */
+/*     $NetBSD: mainbus.c,v 1.7 2010/01/23 06:13:20 kiyohara Exp $     */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,15 +29,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2010/01/23 06:13:20 kiyohara Exp $");
 
-#include "acpi.h"
+#include "acpica.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 
+#if NACPICA > 0
 #include <dev/acpi/acpivar.h>
+#endif
 
 
 static int mainbus_match(device_t, cfdata_t, void *);
@@ -64,14 +66,14 @@
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
 {
-#if NACPI > 0
+#if NACPICA > 0
        struct acpibus_attach_args aaa;
 #endif
 
        aprint_naive("\n");
        aprint_normal("\n");
 
-#if NACPI > 0
+#if NACPICA > 0
        acpi_probe();
 
        aaa.aa_iot = IA64_BUS_SPACE_IO;