From a9f881d039985a468053b25036ef13bc786789bf Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Wed, 17 Jun 2020 14:34:50 +0300
Subject: ACPI: Drop some HAVE_ACPI_RESUME preprocessor use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idfb89ceabac6b6906e31a3dbe9096d48ba680599
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42458
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
---
 src/vendorcode/google/chromeos/elog.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/vendorcode/google/chromeos')

diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c
index 14163a57d7..4dd8b193e8 100644
--- a/src/vendorcode/google/chromeos/elog.c
+++ b/src/vendorcode/google/chromeos/elog.c
@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <acpi/acpi.h>
 #include <bootstate.h>
 #include <console/console.h>
 #include <elog.h>
 #include <security/vboot/vboot_common.h>
 
-#if CONFIG(HAVE_ACPI_RESUME)
-#include <acpi/acpi.h>
-#endif
-
 static void elog_add_boot_reason(void *unused)
 {
 	int rec = vboot_recovery_mode_enabled();
@@ -28,11 +25,9 @@ static void elog_add_boot_reason(void *unused)
 	if (dev) {
 		int log_event = 1;
 
-#if CONFIG(HAVE_ACPI_RESUME)
 		/* Skip logging developer mode in ACPI resume path */
 		if (acpi_is_wakeup())
 			log_event = 0;
-#endif
 
 		if (log_event) {
 			elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE);
-- 
cgit v1.2.3