From: Lv Zheng <lv.zheng@intel.com>
Date: Thu, 4 Aug 2016 08:45:32 +0000 (+0800)
Subject: ACPICA: EFI: Port acpidump to EDK2 environment
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d2d48eae4639f7d74e9d91e7698f566bdbd8cdd6;p=deliverable%2Flinux.git

ACPICA: EFI: Port acpidump to EDK2 environment

ACPICA commit 790b8bae858d6d97da6099c9f8485d4760035a0c

Linux kernel is not affected by this change.

Link: https://github.com/acpica/acpica/commit/790b8bae
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 3dbfa27424ea..f9af0e03e592 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -220,7 +220,7 @@
  * included after including all other host environmental definitions, in
  * order to override the definitions.
  */
-#elif defined(_AED_EFI) || defined(_GNU_EFI)
+#elif defined(_AED_EFI) || defined(_GNU_EFI) || defined(_EDK2_EFI)
 #include "acefi.h"
 
 #else
diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h
index b6726152a300..58ca39ce16d4 100644
--- a/include/acpi/platform/acenvex.h
+++ b/include/acpi/platform/acenvex.h
@@ -67,7 +67,7 @@
  * included after including all other host environmental definitions, in
  * order to override the definitions.
  */
-#elif defined(_AED_EFI) || defined(_GNU_EFI)
+#elif defined(_AED_EFI) || defined(_GNU_EFI) || defined(_EDK2_EFI)
 #include "acefiex.h"
 
 #endif