diff options
| author | Len Brown <len.brown@intel.com> | 2019-04-05 01:07:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 00:12:09 -0400 |
| commit | a27ac38efd6dc6dccebfc9bcc475ab4aa5fc4a56 (patch) | |
| tree | 7faece1ad5a2b8ff6d6f6babbcd53e88e91bc71d | |
| parent | 590275ce72c48fdbddea057bc9ee379c1fd851ef (diff) | |
[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/namespace/nsdump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c index 4550e6f9809b..6c2aef0e0dd4 100644 --- a/drivers/acpi/namespace/nsdump.c +++ b/drivers/acpi/namespace/nsdump.c | |||
| @@ -612,6 +612,7 @@ acpi_ns_dump_objects ( | |||
| 612 | ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object, | 612 | ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object, |
| 613 | (void *) &info, NULL); | 613 | (void *) &info, NULL); |
| 614 | } | 614 | } |
| 615 | #endif /* ACPI_FUTURE_USAGE */ | ||
| 615 | 616 | ||
| 616 | 617 | ||
| 617 | /******************************************************************************* | 618 | /******************************************************************************* |
| @@ -694,5 +695,4 @@ acpi_ns_dump_tables ( | |||
| 694 | return_VOID; | 695 | return_VOID; |
| 695 | } | 696 | } |
| 696 | #endif /* _ACPI_ASL_COMPILER */ | 697 | #endif /* _ACPI_ASL_COMPILER */ |
| 697 | #endif /* ACPI_FUTURE_USAGE */ | ||
| 698 | #endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */ | 698 | #endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */ |