Module Name: src
Committed By: jruoho
Date: Thu Feb 17 07:34:43 UTC 2011
Modified Files:
src/sys/dev/acpi: acpica.h
src/sys/dev/acpi/acpica: OsdMisc.c files.acpica
Log Message:
Switch acpi(4) to use the new location of ACPICA.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpica.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpica/OsdMisc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpica/files.acpica
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpica.h
diff -u src/sys/dev/acpi/acpica.h:1.4 src/sys/dev/acpi/acpica.h:1.5
--- src/sys/dev/acpi/acpica.h:1.4 Fri Mar 5 08:30:48 2010
+++ src/sys/dev/acpi/acpica.h Thu Feb 17 07:34:42 2011
@@ -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 */
Index: src/sys/dev/acpi/acpica/OsdMisc.c
diff -u src/sys/dev/acpi/acpica/OsdMisc.c:1.9 src/sys/dev/acpi/acpica/OsdMisc.c:1.10
--- src/sys/dev/acpi/acpica/OsdMisc.c:1.9 Sun Apr 11 08:58:43 2010
+++ src/sys/dev/acpi/acpica/OsdMisc.c Thu Feb 17 07:34:42 2011
@@ -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"
Index: src/sys/dev/acpi/acpica/files.acpica
diff -u src/sys/dev/acpi/acpica/files.acpica:1.14 src/sys/dev/acpi/acpica/files.acpica:1.15
--- src/sys/dev/acpi/acpica/files.acpica:1.14 Tue Aug 18 16:41:02 2009
+++ src/sys/dev/acpi/acpica/files.acpica Thu Feb 17 07:34:42 2011
@@ -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"
