diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-20 10:54:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-20 10:54:22 +0200 |
| commit | 1d99100120ead486cd7a2502f19eaf1c1699d806 (patch) | |
| tree | e9b5157c93d365f107e341a81a6b5b3946ea1785 /arch/x86/kernel/cpu/mcheck/winchip.c | |
| parent | bc3f5d3dbd576da94a575b1477b8e38551bf11da (diff) | |
| parent | b1f49f9582f9be6de5055cfa97eabf6246f2eaf7 (diff) | |
Merge branch 'x86/mce3' into x86/urgent
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/winchip.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/winchip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c index 81b02487090..54060f56597 100644 --- a/arch/x86/kernel/cpu/mcheck/winchip.c +++ b/arch/x86/kernel/cpu/mcheck/winchip.c @@ -9,10 +9,9 @@ #include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" - /* Machine check handler for WinChip C6: */ static void winchip_machine_check(struct pt_regs *regs, long error_code) { |