Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
大约 1 年 前同步成功

通知 153
Star 36
Fork 7
cloud-kernel
cloud-kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 a27ac38e 编写于 作者: L Len Brown
浏览文件
操作

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

Signed-off-by: NLen Brown <len.brown@intel.com>
上级 590275ce
隐藏空白更改
内联 并排
Showing with 1 addition and 1 deletion
drivers/acpi/namespace/nsdump.c
浏览文件 @ a27ac38e
...@@ -612,6 +612,7 @@ acpi_ns_dump_objects ( ...@@ -612,6 +612,7 @@ acpi_ns_dump_objects (
ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object, ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
(void *) &info, NULL); (void *) &info, NULL);
} }
#endif /* ACPI_FUTURE_USAGE */
/******************************************************************************* /*******************************************************************************
...@@ -694,5 +695,4 @@ acpi_ns_dump_tables ( ...@@ -694,5 +695,4 @@ acpi_ns_dump_tables (
return_VOID; return_VOID;
} }
#endif /* _ACPI_ASL_COMPILER */ #endif /* _ACPI_ASL_COMPILER */
#endif /* ACPI_FUTURE_USAGE */
#endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */ #endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或