diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
tree | d535f46a917e14e90deccb29ad00aac016ad18dd /include/asm-x86/emergency-restart.h | |
parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'include/asm-x86/emergency-restart.h')
-rw-r--r-- | include/asm-x86/emergency-restart.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-x86/emergency-restart.h b/include/asm-x86/emergency-restart.h deleted file mode 100644 index 190d0d8b71e..00000000000 --- a/include/asm-x86/emergency-restart.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ASM_X86__EMERGENCY_RESTART_H -#define ASM_X86__EMERGENCY_RESTART_H - -enum reboot_type { - BOOT_TRIPLE = 't', - BOOT_KBD = 'k', -#ifdef CONFIG_X86_32 - BOOT_BIOS = 'b', -#endif - BOOT_ACPI = 'a', - BOOT_EFI = 'e' -}; - -extern enum reboot_type reboot_type; - -extern void machine_emergency_restart(void); - -#endif /* ASM_X86__EMERGENCY_RESTART_H */ |