fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / mips / dec / reset.c

diff --git a/arch/mips/dec/reset.c b/arch/mips/dec/reset.c
index 7e4d34d..5639722 100644 (file)
--- a/arch/mips/dec/reset.c
+++ b/arch/mips/dec/reset.c
@@ -8,13 +8,12 @@
 #include <linux/linkage.h>
 
 #include <asm/addrspace.h>
-#include <asm/ptrace.h>
 
 typedef void ATTRIB_NORET (* noret_func_t)(void);
 
 static inline void ATTRIB_NORET back_to_prom(void)
 {
-       noret_func_t func = (void *) KSEG1ADDR(0x1fc00000);
+       noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000);
 
        func();
 }
@@ -35,7 +34,7 @@ void ATTRIB_NORET dec_machine_power_off(void)
        back_to_prom();
 }
 
-irqreturn_t dec_intr_halt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t dec_intr_halt(int irq, void *dev_id)
 {
        dec_machine_halt();
 }