summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/time.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-10-06 19:53:39 +0200
committerLinus Torvalds2006-10-06 19:59:54 +0200
commit0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch)
treecfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-s3c2410/time.c
parentMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff)
downloadkernel-qcow2-linux-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.tar.gz
kernel-qcow2-linux-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.tar.xz
kernel-qcow2-linux-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-s3c2410/time.c')
-rw-r--r--arch/arm/mach-s3c2410/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 00d1cfca9712..9910bf0f2cea 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -128,10 +128,10 @@ static unsigned long s3c2410_gettimeoffset (void)
* IRQ handler for the timer
*/
static irqreturn_t
-s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+s3c2410_timer_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
- timer_tick(regs);
+ timer_tick();
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}