diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/acpi/acobject.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/acpi/acobject.h')
| -rw-r--r-- | include/acpi/acobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h index 036023a940b2..e079b94e4fce 100644 --- a/include/acpi/acobject.h +++ b/include/acpi/acobject.h | |||
| @@ -133,6 +133,7 @@ struct acpi_object_integer | |||
| 133 | acpi_integer value; | 133 | acpi_integer value; |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | |||
| 136 | /* | 137 | /* |
| 137 | * Note: The String and Buffer object must be identical through the Pointer | 138 | * Note: The String and Buffer object must be identical through the Pointer |
| 138 | * element. There is code that depends on this. | 139 | * element. There is code that depends on this. |
| @@ -468,7 +469,6 @@ union acpi_operand_object | |||
| 468 | * | 469 | * |
| 469 | *****************************************************************************/ | 470 | *****************************************************************************/ |
| 470 | 471 | ||
| 471 | |||
| 472 | /* Object descriptor types */ | 472 | /* Object descriptor types */ |
| 473 | 473 | ||
| 474 | #define ACPI_DESC_TYPE_CACHED 0x01 /* Used only when object is cached */ | 474 | #define ACPI_DESC_TYPE_CACHED 0x01 /* Used only when object is cached */ |