diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:17:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:17:40 -0700 |
| commit | d06e7a56d91328267a96b1a4df4ede7529f829e8 (patch) | |
| tree | b8034a35c50986d93cb7c0f691f9471bc27b74d1 /arch/sparc64/kernel/time.c | |
| parent | 346fced899c7390e555cf90cd07d1e56b460d21b (diff) | |
| parent | 864ae180074931f3a28c84ea85aa8cfeca18bc4f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/time.c')
| -rw-r--r-- | arch/sparc64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 71b4e380769..b40db389f90 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c @@ -973,7 +973,7 @@ static void sparc64_start_timers(irqreturn_t (*cfunc)(int, void *, struct pt_reg int err; /* Register IRQ handler. */ - err = request_irq(build_irq(0, 0, 0UL, 0UL), cfunc, SA_STATIC_ALLOC, + err = request_irq(build_irq(0, 0, 0UL, 0UL), cfunc, 0, "timer", NULL); if (err) { |