diff --git a/[refs] b/[refs] index c048ffacbfb5..5221a93bf892 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a39f52202a70ff6834e37053e2ee55c7d351621 +refs/heads/master: 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 diff --git a/trunk/arch/m68k/sun3/config.c b/trunk/arch/m68k/sun3/config.c index db930f9070ef..43e4aa3f404a 100644 --- a/trunk/arch/m68k/sun3/config.c +++ b/trunk/arch/m68k/sun3/config.c @@ -35,7 +35,7 @@ extern char _text, _end; char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; extern unsigned long sun3_gettimeoffset(void); -extern void sun3_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)); +extern void sun3_sched_init(irqreturn_t (*handler)(int, void *)); extern void sun3_get_model (char* model); extern void idprom_init (void); extern int sun3_hwclk(int set, struct rtc_time *t); diff --git a/trunk/include/asm-m68k/irq_regs.h b/trunk/include/asm-m68k/irq_regs.h new file mode 100644 index 000000000000..3dd9c0b70270 --- /dev/null +++ b/trunk/include/asm-m68k/irq_regs.h @@ -0,0 +1 @@ +#include