diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/acpi/acpica/utobject.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/acpi/acpica/utobject.c')
| -rw-r--r-- | drivers/acpi/acpica/utobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c index 4279ed3a8782..fd5ea7543e5b 100644 --- a/drivers/acpi/acpica/utobject.c +++ b/drivers/acpi/acpica/utobject.c | |||
| @@ -298,7 +298,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size) | |||
| 298 | * | 298 | * |
| 299 | * RETURN: TRUE if object is valid, FALSE otherwise | 299 | * RETURN: TRUE if object is valid, FALSE otherwise |
| 300 | * | 300 | * |
| 301 | * DESCRIPTION: Validate a pointer to be an union acpi_operand_object | 301 | * DESCRIPTION: Validate a pointer to be a union acpi_operand_object |
| 302 | * | 302 | * |
| 303 | ******************************************************************************/ | 303 | ******************************************************************************/ |
| 304 | 304 | ||
| @@ -390,7 +390,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object) | |||
| 390 | { | 390 | { |
| 391 | ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); | 391 | ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); |
| 392 | 392 | ||
| 393 | /* Object must be an union acpi_operand_object */ | 393 | /* Object must be a union acpi_operand_object */ |
| 394 | 394 | ||
| 395 | if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { | 395 | if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { |
| 396 | ACPI_ERROR((AE_INFO, | 396 | ACPI_ERROR((AE_INFO, |