From 1357176b9022dbad9879cf150d5048551ca2c980 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Fri, 8 Mar 2013 09:22:03 +0000 Subject: [PATCH] --- yaml --- r: 367567 b: refs/heads/master c: f1778eb1ab3e3ef90826b6b6b0ad7fbafa46308b h: refs/heads/master i: 367565: fd969839ec4b2fb9a0ca152ea55535a09cd2453d 367563: 7c061c9e57d723b4df39e57b07d5c47403c96439 367559: c02d4dfe9bcce046f35c6ea4d1979f1cfa98e985 367551: d49d9d8659c0a832ffec472b63e91f9908a5961c v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/acmacros.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd18df4a4d71..632af41e2fc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1af89271711b23ff9eee66de018bc92eb347ea68 +refs/heads/master: f1778eb1ab3e3ef90826b6b6b0ad7fbafa46308b diff --git a/trunk/drivers/acpi/acpica/acmacros.h b/trunk/drivers/acpi/acpica/acmacros.h index 8b7ca40c4eb5..53666bd9193d 100644 --- a/trunk/drivers/acpi/acpica/acmacros.h +++ b/trunk/drivers/acpi/acpica/acmacros.h @@ -325,9 +325,9 @@ * The "DescriptorType" field is the second field in both structures. */ #define ACPI_GET_DESCRIPTOR_PTR(d) (((union acpi_descriptor *)(void *)(d))->common.common_pointer) -#define ACPI_SET_DESCRIPTOR_PTR(d, o) (((union acpi_descriptor *)(void *)(d))->common.common_pointer = o) +#define ACPI_SET_DESCRIPTOR_PTR(d, p) (((union acpi_descriptor *)(void *)(d))->common.common_pointer = (p)) #define ACPI_GET_DESCRIPTOR_TYPE(d) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type) -#define ACPI_SET_DESCRIPTOR_TYPE(d, t) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t) +#define ACPI_SET_DESCRIPTOR_TYPE(d, t) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = (t)) /* * Macros for the master AML opcode table