summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/pc80/keyboard.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 2888bcf295..e389329710 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -25,6 +25,9 @@
#include <device/device.h>
#include <arch/io.h>
#include <delay.h>
+#if CONFIG_HAVE_ACPI_RESUME
+#include <arch/acpi.h>
+#endif
#define KBD_DATA 0x60
#define KBD_COMMAND 0x64
@@ -194,6 +197,12 @@ void pc_keyboard_init(struct pc_keyboard *keyboard)
u8 regval;
if (!CONFIG_DRIVERS_PS2_KEYBOARD)
return;
+
+#if CONFIG_HAVE_ACPI_RESUME
+ if (acpi_slp_type == 3)
+ return;
+#endif
+
printk(BIOS_DEBUG, "Keyboard init...\n");
/* Run a keyboard controller self-test */