diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /arch/i386/kernel/cpu/mcheck/winchip.c | |
parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'arch/i386/kernel/cpu/mcheck/winchip.c')
-rw-r--r-- | arch/i386/kernel/cpu/mcheck/winchip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/winchip.c b/arch/i386/kernel/cpu/mcheck/winchip.c index 5b9d2dd411d..9e424b6c293 100644 --- a/arch/i386/kernel/cpu/mcheck/winchip.c +++ b/arch/i386/kernel/cpu/mcheck/winchip.c @@ -22,7 +22,7 @@ static fastcall void winchip_machine_check(struct pt_regs * regs, long error_cod } /* Set up machine check reporting on the Winchip C6 series */ -void __devinit winchip_mcheck_init(struct cpuinfo_x86 *c) +void winchip_mcheck_init(struct cpuinfo_x86 *c) { u32 lo, hi; machine_check_vector = winchip_machine_check; |