Marc Jones has uploaded this change for review.

View Change

soc/intel/common/block/lpc: Include correct acpi.h

If ACPI is configured, use the correct acpi.h include path.

Change-Id: I0590a028b11f34e423d8f0007e0653037b0849a0
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
---
M src/soc/intel/common/block/lpc/lpc.c
1 file changed, 8 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/48251/1

diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index d11aa10..37b4e04 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -4,10 +4,17 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <intelblocks/acpi.h>
 #include <intelblocks/lpc_lib.h>
 #include <soc/pm.h>
 
+#if CONFIG(HAVE_ACPI_TABLES)
+#if CONFIG(SOC_INTEL_COMMON_BLOCK_ACPI)
+#include <intelblocks/acpi.h>
+#else
+#include <soc/acpi.h>
+#endif	/* HAVE_ACPI_TABLES */
+#endif	/* SOC_INTEL_COMMON_ACPI */
+
 /* SoC overrides */
 
 /* Common weak definition, needs to be implemented in each soc LPC driver. */

To view, visit change 48251. To unsubscribe, or for help writing mail filters, visit settings.