This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / dispatcher / dswload.c

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index f01f9c4..9c0d99e 100644 (file)
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -182,20 +182,18 @@ acpi_ds_load1_begin_op (
                 */
                status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
                                  ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
-#ifdef _ACPI_ASL_COMPILER
-               if (status == AE_NOT_FOUND) {
-                       /*
-                        * Table disassembly:
-                        * Target of Scope() not found.  Generate an External for it, and
-                        * insert the name into the namespace.
-                        */
-                       acpi_dm_add_to_external_list (path);
-                       status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
-                                          ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
-               }
-#endif
                if (ACPI_FAILURE (status)) {
+#ifdef _ACPI_ASL_COMPILER
+                       if (status == AE_NOT_FOUND) {
+                               acpi_dm_add_to_external_list (path);
+                               status = AE_OK;
+                       }
+                       else {
+                               ACPI_REPORT_NSERROR (path, status);
+                       }
+#else
                        ACPI_REPORT_NSERROR (path, status);
+#endif
                        return (status);
                }