[coreboot-gerrit] New patch to review for coreboot: soc/intel/apollolake: make gpo.h ACPI compatible

[Freddy Paul (freddy.paul@intel.com)]

Freddy Paul (freddy.paul at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15272

-gerrit

commit 12a9994c65f9ab935445d088b8ae758c22dbb73f
Author: Freddy Paul <freddy.paul at intel.com>
Date:   Mon Jun 20 12:29:10 2016 -0700

    soc/intel/apollolake: make gpo.h ACPI compatible
    
    BUG=None
    TEST=Build with <soc/gpio.h> included in mainboard.asl
    
    Change-Id: Id6fdc50d09c014f930fdfd5c2fde0df827ad5181
    Signed-off-by: Freddy Paul <freddy.paul at intel.com>
---
 src/soc/intel/apollolake/include/soc/gpio.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h
index f01284e..c9d32cc 100644
--- a/src/soc/intel/apollolake/include/soc/gpio.h
+++ b/src/soc/intel/apollolake/include/soc/gpio.h
@@ -18,8 +18,10 @@
 #ifndef _SOC_APOLLOLAKE_GPIO_H_
 #define _SOC_APOLLOLAKE_GPIO_H_
 
-#include <types.h>
 #include <soc/gpio_defs.h>
+/* __ACPI__ guard is needed to ignore below code in ACPI/ASL compilation */
+#ifndef __ACPI__
+#include <types.h>
 
 typedef uint32_t gpio_t;
 
@@ -97,4 +99,5 @@ struct pad_config {
 void gpio_configure_pad(const struct pad_config *cfg);
 void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads);
 
+#endif /* __ACPI__ */
 #endif /* _SOC_APOLLOLAKE_GPIO_H_ */