diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-16 11:51:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-16 11:51:13 +1000 |
| commit | 764e2a0fde689d9fb3ca9b6e32dabc6aea4bfcdc (patch) | |
| tree | 96b1c391f16c0c951a396023608ca4c42591dc59 /arch | |
| parent | 89e1b3b7ae6ca57b4bc00614e6f6bb68c8b4f5d2 (diff) | |
| parent | 821fb0b2f3f5790fb65948ef2ec3fd165557ad2f (diff) | |
Merge commit 'acpi/test'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 1340dad417f4..ecc14a2a62c4 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -32,7 +32,7 @@ EXPORT_SYMBOL(pm_power_off); static const struct desc_ptr no_idt = {}; static int reboot_mode; -enum reboot_type reboot_type = BOOT_KBD; +enum reboot_type reboot_type = BOOT_ACPI; int reboot_force; #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) |