commit 45d818b4ab29d950c8879574709891c955e8bc21
author Elyes Haouas <ehaouas@noos.fr> Mon Dec 12 21:14:16 2022 +0100
committer Martin L Roth <gaumless@gmail.com> Thu Dec 15 03:13:11 2022 +0000
tree 00c3bf365ad27a9d1cf3edaf6d9f920ea2cdcb72
parent 4f29739be32d66a717c6af43a89a9174e4f41182

nb/intel/sandybridge/sandybridge.h: Remove unnecessary guard

__ACPI__ is covered through __ASSEMBLER__.

Change-Id: I6a637e63c6bbe4af7cd52be1893e47d6b5967886
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70697
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>

src/northbridge/intel/sandybridge/sandybridge.h

diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index 1a92745..1e87864 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -11,7 +11,7 @@
 #include "memmap.h"
 
 /* Everything below this line is ignored in the DSDT */
-#ifndef __ACPI__
+#ifndef __ASSEMBLER__
 #include <types.h>
 
 /* Chipset types */
@@ -54,8 +54,6 @@
 
 #include "registers/dmibar.h"
 
-#ifndef __ASSEMBLER__
-
 bool is_sandybridge(void);
 
 void intel_sandybridge_finalize_smm(void);
@@ -78,6 +76,5 @@
 unsigned long northbridge_write_acpi_tables(const struct device *device, unsigned long start,
 					    struct acpi_rsdp *rsdp);
 
-#endif
-#endif
+#endif /* __ASSEMBLER__ */
 #endif /* __NORTHBRIDGE_INTEL_SANDYBRIDGE_SANDYBRIDGE_H__ */