aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-epxa10db/time.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-26 17:28:24 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-26 17:28:24 -0700
commit41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch)
treee8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch/arm/mach-epxa10db/time.c
parent5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff)
parent26799e675e47c5aa3104628e2081a7299ea46557 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-epxa10db/time.c')
-rw-r--r--arch/arm/mach-epxa10db/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-epxa10db/time.c b/arch/arm/mach-epxa10db/time.c
index 1b991f3cc3c..4b1084dde8d 100644
--- a/arch/arm/mach-epxa10db/time.c
+++ b/arch/arm/mach-epxa10db/time.c
@@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction epxa10db_timer_irq = {
.name = "Excalibur Timer Tick",
- .flags = SA_INTERRUPT,
- .handler = epxa10db_timer_interrupt
+ .flags = SA_INTERRUPT | SA_TIMER,
+ .handler = epxa10db_timer_interrupt,
};
/*