Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7624
-gerrit
commit 2f688636275fad0a73f0c75b7ef505e2e0674b16 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Tue Dec 2 17:44:47 2014 +1100
southbridge/amd/agesa/hudson/early_setup.c: Use IS_ENABLED macro
Change-Id: I2adb5a8fe2cede988cc6fdef5ff81da86d267175 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/southbridge/amd/agesa/hudson/early_setup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/southbridge/amd/agesa/hudson/early_setup.c b/src/southbridge/amd/agesa/hudson/early_setup.c index 039df20..1b9b689 100644 --- a/src/southbridge/amd/agesa/hudson/early_setup.c +++ b/src/southbridge/amd/agesa/hudson/early_setup.c @@ -123,7 +123,7 @@ int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) return nvram_pos; }
-#if CONFIG_HAVE_ACPI_RESUME +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) int acpi_get_sleep_type(void) { u16 tmp = inw(ACPI_PM1_CNT_BLK); @@ -131,14 +131,12 @@ int acpi_get_sleep_type(void) /* printk(BIOS_DEBUG, "SLP_TYP type was %x\n", tmp); */ return (int)tmp; } -#endif
-#if CONFIG_HAVE_ACPI_RESUME int acpi_is_wakeup_early(void) { return (acpi_get_sleep_type() == 3); } -#endif +#endif /* CONFIG_HAVE_ACPI_RESUME */
unsigned long get_top_of_ram(void) { @@ -153,4 +151,4 @@ unsigned long get_top_of_ram(void) return (unsigned long) xdata; }
-#endif +#endif /* _HUDSON_EARLY_SETUP_C_ */