Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / drivers / acpi / acpica / exresolv.c

diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 3673d2b2c4ac07a592479b0585131a5408e8a164..f6105a6d6126776fd39fcdcafda104553d5c69fe 100644 (file)
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -147,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
        stack_desc = *stack_ptr;
 
-       /* This is an union acpi_operand_object    */
+       /* This is a union acpi_operand_object    */
 
        switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
        case ACPI_TYPE_LOCAL_REFERENCE: