# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/04/19 00:07:45-04:00 len.brown@intel.com 
#   [ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
#   
#   Signed-off-by: Len Brown <len.brown@intel.com>
# 
# drivers/acpi/namespace/nsdump.c
#   2005/04/19 00:07:36-04:00 len.brown@intel.com +1 -1
#   fix merge error that broke CONFIG_ACPI_DEBUG=y build
# 
Index: linux-2.6.13/drivers/acpi/namespace/nsdump.c
===================================================================
--- linux-2.6.13.orig/drivers/acpi/namespace/nsdump.c	2005-07-10 01:05:46.000000000 -0400
+++ linux-2.6.13/drivers/acpi/namespace/nsdump.c	2005-07-10 01:07:26.000000000 -0400
@@ -612,6 +612,7 @@
 			 ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
 			 (void *) &info, NULL);
 }
+#endif	/* ACPI_FUTURE_USAGE */
 
 
 /*******************************************************************************
@@ -694,5 +695,4 @@
 	return_VOID;
 }
 #endif	/* _ACPI_ASL_COMPILER */
-#endif  /* ACPI_FUTURE_USAGE */
 #endif	/* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */