Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / psopcode.c

diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 451b672915f11f7eacc7c3b6f81148e3c1dd09d2..c343a0d5a3d283ff7fc870038c4dd09b1e87f84e 100644 (file)
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -69,7 +69,7 @@ ACPI_MODULE_NAME("psopcode")
        AML_DEVICE_OP
        AML_THERMAL_ZONE_OP
        AML_METHOD_OP
-       AML_POWER_RES_OP
+       AML_POWER_RESOURCE_OP
        AML_PROCESSOR_OP
        AML_FIELD_OP
        AML_INDEX_FIELD_OP
@@ -95,7 +95,7 @@ ACPI_MODULE_NAME("psopcode")
        AML_DEVICE_OP
        AML_THERMAL_ZONE_OP
        AML_METHOD_OP
-       AML_POWER_RES_OP
+       AML_POWER_RESOURCE_OP
        AML_PROCESSOR_OP
        AML_FIELD_OP
        AML_INDEX_FIELD_OP
@@ -113,7 +113,7 @@ ACPI_MODULE_NAME("psopcode")
        AML_DEVICE_OP
        AML_THERMAL_ZONE_OP
        AML_METHOD_OP
-       AML_POWER_RES_OP
+       AML_POWER_RESOURCE_OP
        AML_PROCESSOR_OP
        AML_NAME_OP
        AML_ALIAS_OP
@@ -136,7 +136,7 @@ ACPI_MODULE_NAME("psopcode")
        AML_DEVICE_OP
        AML_THERMAL_ZONE_OP
        AML_METHOD_OP
-       AML_POWER_RES_OP
+       AML_POWER_RESOURCE_OP
        AML_PROCESSOR_OP
        AML_NAME_OP
        AML_ALIAS_OP
@@ -149,7 +149,7 @@ ACPI_MODULE_NAME("psopcode")
   must be deferred until needed
 
        AML_METHOD_OP
-       AML_VAR_PACKAGE_OP
+       AML_VARIABLE_PACKAGE_OP
        AML_CREATE_FIELD_OP
        AML_CREATE_BIT_FIELD_OP
        AML_CREATE_BYTE_FIELD_OP
@@ -652,7 +652,10 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 
        /* 81 */ ACPI_OP("External", ARGP_EXTERNAL_OP, ARGI_EXTERNAL_OP,
                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE, /* ? */
-                        AML_TYPE_EXEC_3A_0T_0R, AML_FLAGS_EXEC_3A_0T_0R)
+                        AML_TYPE_EXEC_3A_0T_0R, AML_FLAGS_EXEC_3A_0T_0R),
+/* 82 */ ACPI_OP("Comment", ARGP_COMMENT_OP, ARGI_COMMENT_OP,
+                        ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
+                        AML_TYPE_LITERAL, AML_CONSTANT)
 
 /*! [End] no source code translation !*/
 };