git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f78c6da
..
5639722
100644
(file)
--- a/
arch/mips/dec/reset.c
+++ b/
arch/mips/dec/reset.c
@@
-8,7
+8,6
@@
#include <linux/linkage.h>
#include <asm/addrspace.h>
#include <linux/linkage.h>
#include <asm/addrspace.h>
-#include <asm/ptrace.h>
typedef void ATTRIB_NORET (* noret_func_t)(void);
typedef void ATTRIB_NORET (* noret_func_t)(void);
@@
-35,7
+34,7
@@
void ATTRIB_NORET dec_machine_power_off(void)
back_to_prom();
}
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();
}
{
dec_machine_halt();
}