luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2019-04-05 00:07:45 -05:00
parent 590275ce72
commit a27ac38efd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/namespace/nsdump.c
View File

@ -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) */