Commit a27ac38e authored by Len Brown's avatar Len Brown
Browse files

[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 590275ce

drivers/acpi/namespace/nsdump.c

+1 −1
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ acpi_ns_dump_objects ( 
			 ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,

			 (void *) &info, NULL);

}

#endif	/* ACPI_FUTURE_USAGE */





/*******************************************************************************
@@ -694,5 +695,4 @@ acpi_ns_dump_tables ( 
	return_VOID;

}

#endif	/* _ACPI_ASL_COMPILER */

#endif  /* ACPI_FUTURE_USAGE */

#endif	/* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */