diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/acpi/dispatcher/dswexec.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/acpi/dispatcher/dswexec.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dswexec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c index b246b9657ead..b5072fa9c920 100644 --- a/drivers/acpi/dispatcher/dswexec.c +++ b/drivers/acpi/dispatcher/dswexec.c | |||
| @@ -408,14 +408,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) | |||
| 408 | [walk_state-> | 408 | [walk_state-> |
| 409 | num_operands - 1]), | 409 | num_operands - 1]), |
| 410 | walk_state); | 410 | walk_state); |
| 411 | if (ACPI_SUCCESS(status)) { | ||
| 412 | ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, | ||
| 413 | ACPI_IMODE_EXECUTE, | ||
| 414 | acpi_ps_get_opcode_name | ||
| 415 | (walk_state->opcode), | ||
| 416 | walk_state->num_operands, | ||
| 417 | "after ExResolveOperands"); | ||
| 418 | } | ||
| 419 | } | 411 | } |
| 420 | 412 | ||
| 421 | if (ACPI_SUCCESS(status)) { | 413 | if (ACPI_SUCCESS(status)) { |