From 143d8999c175189746df77e53c3124c9fc94eece Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sat, 22 Nov 2008 23:39:23 -0800
Subject: [PATCH] --- yaml --- r: 120916 b: refs/heads/master c:
 3889d0cea2b73049bdca062d9ff1e5d33468289c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 509f0d36936c..b085f9c8c2f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14d7ca5c575853664d8fe4f225a77b8df1b7de7d
+refs/heads/master: 3889d0cea2b73049bdca062d9ff1e5d33468289c
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index ddc93891cdcd..790b09fbadcb 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/arch/x86/kernel/reboot.c
@@ -29,7 +29,7 @@ EXPORT_SYMBOL(pm_power_off);
 
 static const struct desc_ptr no_idt = {};
 static int reboot_mode;
-enum reboot_type reboot_type = BOOT_CF9_COND;
+enum reboot_type reboot_type = BOOT_KBD;
 int reboot_force;
 
 #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)