Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / acpi / executer / exoparg6.c

diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index f0c0ba6..e043d92 100644 (file)
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -220,7 +220,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
        acpi_integer index;
        union acpi_operand_object *this_element;
 
        acpi_integer index;
        union acpi_operand_object *this_element;
 

-       ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,
+       ACPI_FUNCTION_TRACE_STR("ex_opcode_6A_0T_1R",

                                acpi_ps_get_opcode_name(walk_state->opcode));
 
        switch (walk_state->opcode) {
                                acpi_ps_get_opcode_name(walk_state->opcode));
 
        switch (walk_state->opcode) {


@@ -276,7 +276,6 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                 * match was found.
                 */
                for (; index < operand[0]->package.count; index++) {
                 * match was found.
                 */
                for (; index < operand[0]->package.count; index++) {

-

                        /* Get the current package element */
 
                        this_element = operand[0]->package.elements[index];
                        /* Get the current package element */
 
                        this_element = operand[0]->package.elements[index];