From 6543d9a4f0d28f49478ab183b3a75f98e7e5875b Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 17 Jun 2017 23:33:19 -0500 Subject: drivers/fsp1_1: remove VBT function defs from util.h Including in util.h causes issues with redeclarations when using SOC_INTEL_COMMON_GFX_OPREGION along with FSP 1.1. Separating it out and including directly in vbt.c has no negative side effects. Change-Id: I2d82c2da40b067272d876929fc73b97f490146a7 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/20448 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/intel/fsp1_1/include/fsp/util.h | 1 - src/drivers/intel/fsp1_1/vbt.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h index 8f552560d5..ffc43bc01c 100644 --- a/src/drivers/intel/fsp1_1/include/fsp/util.h +++ b/src/drivers/intel/fsp1_1/include/fsp/util.h @@ -21,7 +21,6 @@ #include /* Current users expect to get the SoC's FSP definitions by including util.h. */ #include -#include #include #include diff --git a/src/drivers/intel/fsp1_1/vbt.c b/src/drivers/intel/fsp1_1/vbt.c index 5cac150d01..92a4c91cbf 100644 --- a/src/drivers/intel/fsp1_1/vbt.c +++ b/src/drivers/intel/fsp1_1/vbt.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include -- cgit v1.2.3