aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-03 23:53:50 -0400
committerLen Brown <len.brown@intel.com>2005-08-03 23:53:50 -0400
commit8edc81cc0b80b3ec8645711e1110a84235c7030d (patch)
tree6488d39a0b867ef6db82993155013466162cf53d /drivers/acpi
parent11e981f1e02c2a36465cbb208b21cb8b6480f399 (diff)
parent62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6 (diff)
Merge ../to-linus-stable
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/dispatcher/dswload.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 1ac197ccfc80..d11620018421 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -491,12 +491,6 @@ acpi_ds_load2_begin_op (
491 if ((!(walk_state->op_info->flags & AML_NSOPCODE) && 491 if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
492 (walk_state->opcode != AML_INT_NAMEPATH_OP)) || 492 (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
493 (!(walk_state->op_info->flags & AML_NAMED))) { 493 (!(walk_state->op_info->flags & AML_NAMED))) {
494 if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
495 (walk_state->op_info->class == AML_CLASS_CONTROL)) {
496 ACPI_REPORT_WARNING ((
497 "Encountered executable code at module level, [%s]\n",
498 acpi_ps_get_opcode_name (walk_state->opcode)));
499 }
500 return_ACPI_STATUS (AE_OK); 494 return_ACPI_STATUS (AE_OK);
501 } 495 }
502 496