summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/components/namespace/nsinit.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-04-19 23:49:34 +0000
committerjkim <jkim@FreeBSD.org>2013-04-19 23:49:34 +0000
commit1d7102aa1b8c84f1186ae05e3678f2cac71c0f5c (patch)
tree5f5a3414edb3b26bbd9583d16c6368e24578edff /sys/contrib/dev/acpica/components/namespace/nsinit.c
parent91a43667738a5b60b71f7b124b2c9686c2338341 (diff)
parent2827e383d552774c11bb806510c3468678d07994 (diff)
downloadFreeBSD-src-1d7102aa1b8c84f1186ae05e3678f2cac71c0f5c.zip
FreeBSD-src-1d7102aa1b8c84f1186ae05e3678f2cac71c0f5c.tar.gz
Merge ACPICA 20130418.
Diffstat (limited to 'sys/contrib/dev/acpica/components/namespace/nsinit.c')
-rw-r--r--sys/contrib/dev/acpica/components/namespace/nsinit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/components/namespace/nsinit.c b/sys/contrib/dev/acpica/components/namespace/nsinit.c
index e9c9781..f59d5f7 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsinit.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsinit.c
@@ -198,7 +198,7 @@ AcpiNsInitializeDevices (
* part of the ACPI specification.
*/
Info.EvaluateInfo->PrefixNode = AcpiGbl_RootNode;
- Info.EvaluateInfo->Pathname = METHOD_NAME__INI;
+ Info.EvaluateInfo->RelativePathname = METHOD_NAME__INI;
Info.EvaluateInfo->Parameters = NULL;
Info.EvaluateInfo->Flags = ACPI_IGNORE_RETURN_VALUE;
@@ -610,7 +610,7 @@ AcpiNsInitOneDevice (
ACPI_TYPE_METHOD, DeviceNode, METHOD_NAME__INI));
Info->PrefixNode = DeviceNode;
- Info->Pathname = METHOD_NAME__INI;
+ Info->RelativePathname = METHOD_NAME__INI;
Info->Parameters = NULL;
Info->Flags = ACPI_IGNORE_RETURN_VALUE;
@@ -625,7 +625,7 @@ AcpiNsInitOneDevice (
{
/* Ignore error and move on to next device */
- char *ScopeName = AcpiNsGetExternalPathname (Info->ResolvedNode);
+ char *ScopeName = AcpiNsGetExternalPathname (Info->Node);
ACPI_EXCEPTION ((AE_INFO, Status, "during %s._INI execution",
ScopeName));
OpenPOWER on IntegriCloud