diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 10:53:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 10:59:54 -0700 |
| commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
| tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-footbridge/dc21285-timer.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-dev-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.tar.xz linux-dev-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.zip | |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-footbridge/dc21285-timer.c')
| -rw-r--r-- | arch/arm/mach-footbridge/dc21285-timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index 2af610811ca4..fa6be870c6c2 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c @@ -28,13 +28,13 @@ static unsigned long timer1_gettimeoffset (void) } static irqreturn_t -timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs) +timer1_interrupt(int irq, void *dev_id) { write_seqlock(&xtime_lock); *CSR_TIMER1_CLR = 0; - timer_tick(regs); + timer_tick(); write_sequnlock(&xtime_lock); |