diff options
| author | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
| commit | fa5d03cca6e75599903d9e88eb88558b07b57224 (patch) | |
| tree | 88dae9a5d7e108bfbd0e233fac4e5d043718b0b2 /sys/contrib/dev/acpica/include/aclocal.h | |
| parent | 83fed061c4fe4086f0414be4bd83235282f469cb (diff) | |
| download | FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.zip FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.tar.gz | |
Merge ACPICA 20100121.
Diffstat (limited to 'sys/contrib/dev/acpica/include/aclocal.h')
| -rw-r--r-- | sys/contrib/dev/acpica/include/aclocal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h index 52dbec3..0aeacff 100644 --- a/sys/contrib/dev/acpica/include/aclocal.h +++ b/sys/contrib/dev/acpica/include/aclocal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License @@ -500,6 +500,7 @@ typedef struct acpi_predefined_data { char *Pathname; const ACPI_PREDEFINED_INFO *Predefined; + union acpi_operand_object *ParentPackage; UINT32 Flags; UINT8 NodeFlags; @@ -852,8 +853,7 @@ typedef struct acpi_opcode_info typedef union acpi_parse_value { - ACPI_INTEGER Integer; /* Integer constant (Up to 64 bits) */ - UINT64_STRUCT Integer64; /* Structure overlay for 2 32-bit Dwords */ + UINT64 Integer; /* Integer constant (Up to 64 bits) */ UINT32 Size; /* bytelist or field size */ char *String; /* NULL terminated string */ UINT8 *Buffer; /* buffer or string */ |
