[src/trunk]: src/sys/dev/acpi Switch acpi(4) to use the new location of ACPICA.

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

details:   https://anonhg.NetBSD.org/src/rev/3bdfc585a97a
branches:  trunk
changeset: 762175:3bdfc585a97a
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Feb 17 07:34:42 2011 +0000

description:
Switch acpi(4) to use the new location of ACPICA.

diffstat:

 sys/dev/acpi/acpica.h            |  6 +++---
 sys/dev/acpi/acpica/OsdMisc.c    |  7 ++-----
 sys/dev/acpi/acpica/files.acpica |  4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r b027621b28fa -r 3bdfc585a97a sys/dev/acpi/acpica.h
--- a/sys/dev/acpi/acpica.h     Thu Feb 17 07:27:17 2011 +0000
+++ b/sys/dev/acpi/acpica.h     Thu Feb 17 07:34:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpica.h,v 1.4 2010/03/05 08:30:48 jruoho Exp $        */
+/*     $NetBSD: acpica.h,v 1.5 2011/02/17 07:34:42 jruoho Exp $        */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -43,7 +43,7 @@
  * headers.
  */
 
-#include <external/intel-public/acpica/dist/include/acpi.h>
-#include <external/intel-public/acpica/dist/include/accommon.h>
+#include <external/bsd/acpica/dist/include/acpi.h>
+#include <external/bsd/acpica/dist/include/accommon.h>
 
 #endif /* !_SYS_DEV_ACPI_ACPICA_H */
diff -r b027621b28fa -r 3bdfc585a97a sys/dev/acpi/acpica/OsdMisc.c
--- a/sys/dev/acpi/acpica/OsdMisc.c     Thu Feb 17 07:27:17 2011 +0000
+++ b/sys/dev/acpi/acpica/OsdMisc.c     Thu Feb 17 07:34:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: OsdMisc.c,v 1.9 2010/04/11 08:58:43 jruoho Exp $       */
+/*     $NetBSD: OsdMisc.c,v 1.10 2011/02/17 07:34:42 jruoho Exp $      */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.9 2010/04/11 08:58:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.10 2011/02/17 07:34:42 jruoho Exp $");
 
 #include "opt_acpi.h"
 #include "opt_ddb.h"
@@ -58,9 +58,6 @@
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpi_osd.h>
 
-#include <external/intel-public/acpica/dist/include/accommon.h>
-#include <external/intel-public/acpica/dist/include/acdebug.h>
-
 #ifdef ACPI_DSDT_OVERRIDE
 #ifndef ACPI_DSDT_FILE
 #define ACPI_DSDT_FILE "dsdt.hex"
diff -r b027621b28fa -r 3bdfc585a97a sys/dev/acpi/acpica/files.acpica
--- a/sys/dev/acpi/acpica/files.acpica  Thu Feb 17 07:27:17 2011 +0000
+++ b/sys/dev/acpi/acpica/files.acpica  Thu Feb 17 07:34:42 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.acpica,v 1.14 2009/08/18 16:41:02 jmcneill Exp $
+#      $NetBSD: files.acpica,v 1.15 2011/02/17 07:34:42 jruoho Exp $
 
 file   dev/acpi/acpica/OsdEnvironment.c        acpica  needs-flag
 file   dev/acpi/acpica/OsdHardware.c           acpica
@@ -9,4 +9,4 @@
 file   dev/acpi/acpica/OsdStream.c             acpica
 file   dev/acpi/acpica/OsdSynch.c              acpica
 
-include        "external/intel-public/acpica/conf/files.acpica"
+include        "external/bsd/acpica/conf/files.acpica"