diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
commit | 08476907abf25315acb4c9a72a0e78bf61456696 (patch) | |
tree | 2f1c0f34771029458813c3015ef9b02b7333dfde /drivers/acpi/acpica/nsload.c | |
parent | Merge branch 'pm-devfreq' (diff) | |
parent | ACPICA: Enable auto-serialization as a default kernel behavior. (diff) | |
download | linux-08476907abf25315acb4c9a72a0e78bf61456696.tar.xz linux-08476907abf25315acb4c9a72a0e78bf61456696.zip |
Merge branch 'acpica'
* acpica:
ACPICA: Enable auto-serialization as a default kernel behavior.
ACPICA: Ignore sync_level for methods that have been auto-serialized.
ACPICA: Add additional named objects for the auto-serialize method scan.
ACPICA: Add auto-serialization support for ill-behaved control methods.
ACPICA: Remove global option to serialize all control methods.
Diffstat (limited to 'drivers/acpi/acpica/nsload.c')
-rw-r--r-- | drivers/acpi/acpica/nsload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c index 7ae521ce8d3f..7c9d0181f341 100644 --- a/drivers/acpi/acpica/nsload.c +++ b/drivers/acpi/acpica/nsload.c @@ -128,12 +128,12 @@ unlock: * parse trees. */ ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "**** Begin Table Method Parsing and Object Initialization\n")); + "**** Begin Table Object Initialization\n")); status = acpi_ds_initialize_objects(table_index, node); ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "**** Completed Table Method Parsing and Object Initialization\n")); + "**** Completed Table Object Initialization\n")); return_ACPI_STATUS(status); } |