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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
m68k
/
sun3x
/
time.c
diff --git
a/arch/m68k/sun3x/time.c
b/arch/m68k/sun3x/time.c
index
6f4204f
..
f5eaafb
100644
(file)
--- a/
arch/m68k/sun3x/time.c
+++ b/
arch/m68k/sun3x/time.c
@@
-90,7
+90,7
@@
static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
}
#endif
}
#endif
-void __init sun3x_sched_init(irq
return_t (*vector)(int, void *, struct pt_regs *)
)
+void __init sun3x_sched_init(irq
_handler_t vector
)
{
sun3_disable_interrupts();
{
sun3_disable_interrupts();