From eb064b3947faed91e008d730ce80025738f02e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 24 Aug 2017 21:20:10 +0300 Subject: amd/XX/hudson: Remove #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the unnecessary #if from around the #include "fchec.h". Turn #if statements into if(). Change-Id: Ia0582b3ce24c55dd439dfadb727507240accd9d5 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21188 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/southbridge/amd/agesa/hudson/hudson.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/southbridge/amd/agesa/hudson/hudson.c') diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c index 101f5d42a2..9a6df61dba 100644 --- a/src/southbridge/amd/agesa/hudson/hudson.c +++ b/src/southbridge/amd/agesa/hudson/hudson.c @@ -181,12 +181,10 @@ static void hudson_init(void *chip_info) static void hudson_final(void *chip_info) { -#if !IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE) -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) /* AMD AGESA does not enable thermal zone, so we enable it here. */ - enable_imc_thermal_zone(); -#endif -#endif + if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM) && + !IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)) + enable_imc_thermal_zone(); } struct chip_operations southbridge_amd_agesa_hudson_ops = { -- cgit v1.2.3