aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/namespace/nsaccess.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index c39a7f68b889..29c7c271dbb8 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -165,12 +165,9 @@ acpi_status acpi_ns_root_initialize(void)
165 165
166 obj_desc->method.method_flags = 166 obj_desc->method.method_flags =
167 AML_METHOD_INTERNAL_ONLY; 167 AML_METHOD_INTERNAL_ONLY;
168
169#ifndef ACPI_DUMP_APP
170 obj_desc->method.implementation = 168 obj_desc->method.implementation =
171 acpi_ut_osi_implementation; 169 acpi_ut_osi_implementation;
172#endif 170#endif
173#endif
174 break; 171 break;
175 172
176 case ACPI_TYPE_INTEGER: 173 case ACPI_TYPE_INTEGER:
@@ -521,11 +518,11 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
521 } 518 }
522 519
523 /* 520 /*
524 * Search namespace for each segment of the name. Loop through and 521 * Search namespace for each segment of the name. Loop through and
525 * verify (or add to the namespace) each name segment. 522 * verify (or add to the namespace) each name segment.
526 * 523 *
527 * The object type is significant only at the last name 524 * The object type is significant only at the last name
528 * segment. (We don't care about the types along the path, only 525 * segment. (We don't care about the types along the path, only
529 * the type of the final target object.) 526 * the type of the final target object.)
530 */ 527 */
531 this_search_type = ACPI_TYPE_ANY; 528 this_search_type = ACPI_TYPE_ANY;