From 6202aea9220f6a423429cba625c0444f88f9bb58 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Fri, 20 Jun 2014 05:41:21 +0300
Subject: PS2 keyboard: Use acpi_is_wakeup_s3()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/drivers/pc80/keyboard.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 6a573d8e08..06eae463e1 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 @@ void pc_keyboard_init(void)
 	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");
 
-- 
cgit v1.2.3