Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

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

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 565d4557d0e0575957b63c80a5fbb6bca7640c12..8ab9d1b29a4ce4062f1163ed746a16a258c4cd4f 100644 (file)
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -754,11 +754,11 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                }
 
                flags = ACPI_NS_NO_UPSEARCH;
-               if (walk_state->pass_number == 3) {
+               if (walk_state->pass_number == ACPI_IMODE_EXECUTE) {
 
-                       /* Execution mode, node cannot already exist */
+                       /* Execution mode, node cannot already exist, node is temporary */
 
-                       flags |= ACPI_NS_ERROR_IF_FOUND;
+                       flags |= (ACPI_NS_ERROR_IF_FOUND | ACPI_NS_TEMPORARY);
                }
 
                /* Add new entry or lookup existing entry */