projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
590275c
)
[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
author
Len Brown
<len.brown@intel.com>
Fri, 5 Apr 2019 05:07:45 +0000
(
00:07
-0500)
committer
Len Brown
<len.brown@intel.com>
Tue, 12 Jul 2005 04:12:09 +0000
(
00:12
-0400)
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/namespace/nsdump.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/acpi/namespace/nsdump.c
b/drivers/acpi/namespace/nsdump.c
index 4550e6f9809bddb529a6ef016e3a12d2b1ad29f1..6c2aef0e0dd4d47b8f451c487d7c83777a1f8cc8 100644
(file)
--- a/
drivers/acpi/namespace/nsdump.c
+++ b/
drivers/acpi/namespace/nsdump.c
@@
-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) */