PS2 keyboard: Use acpi_is_wakeup_s3()
Change-Id: I812cc40e50a1e7e13caed48a1693feb8658b645c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6073
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 6a573d8..06eae46 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -25,9 +25,7 @@
#include <arch/io.h>
#include <delay.h>
#include <types.h>
-#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
-#endif
#define KBD_DATA 0x60
#define KBD_COMMAND 0x64
@@ -202,10 +200,8 @@
if (!CONFIG_DRIVERS_PS2_KEYBOARD)
return;
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup_s3())
return;
-#endif
printk(BIOS_DEBUG, "Keyboard init...\n");