diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 09:56:12 +0200 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-mips/time.h | |
| parent | [netdrvr] b44: handle excessive multicast groups (diff) | |
| parent | ACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff) | |
| download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-mips/time.h')
| -rw-r--r-- | include/asm-mips/time.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 2d543735668b..28512ba2266e 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h @@ -67,18 +67,18 @@ extern unsigned long (*do_gettimeoffset)(void); /* * high-level timer interrupt routines. */ -extern irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); +extern irqreturn_t timer_interrupt(int irq, void *dev_id); /* * the corresponding low-level timer interrupt routine. */ -extern asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs); +extern asmlinkage void ll_timer_interrupt(int irq); /* * profiling and process accouting is done separately in local_timer_interrupt */ -extern void local_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); -extern asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs); +extern void local_timer_interrupt(int irq, void *dev_id); +extern asmlinkage void ll_local_timer_interrupt(int irq); /* * board specific routines required by time_init(). |