diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2006-11-20 00:46:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-20 13:16:49 -0500 |
| commit | ace5f1d425beaa272b6e91cecc87b2c075d7feb2 (patch) | |
| tree | 9445f6ba8d8be95e999fdd2496027cee48713b72 /arch/m68knommu/kernel/time.c | |
| parent | 49a1cd00b599d12c3f397e5a32f81f6e2aab0d74 (diff) | |
[PATCH] m68knommu: fix up for the irq_handler_t changes
Switch to using irq_handler_t for interrupt function handler pointers.
Change name of m68knommu's irq_hanlder_t data structure so it doesn't
clash with the common type (include/linux/interrupt.h).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68knommu/kernel/time.c')
| -rw-r--r-- | arch/m68knommu/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index c5667bdddd5e..9226264abf1a 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c | |||
| @@ -54,7 +54,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs) | |||
| 54 | update_process_times(user_mode(regs)); | 54 | update_process_times(user_mode(regs)); |
| 55 | #endif | 55 | #endif |
| 56 | if (current->pid) | 56 | if (current->pid) |
| 57 | profile_tick(CPU_PROFILING, regs); | 57 | profile_tick(CPU_PROFILING); |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * If we have an externally synchronized Linux clock, then update | 60 | * If we have an externally synchronized Linux clock, then update |