diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-26 12:06:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-06-26 12:06:36 -0400 |
commit | 09b8b5f843afc21daf710cc610e5ca890ee94696 (patch) | |
tree | ca6c4e4555e448ebfa884ee3ba8e8a7ae6bc35f7 /arch/arm/mach-sa1100 | |
parent | 6f0dcb72d6a053fff9288b742d3bcc9b23f0f6db (diff) |
[PATCH] ARM: Add SA_TIMER flag to timer interrupts
VST needs to know which timer handler is for the timer interrupt.
Mark all timer interrupts with the SA_TIMER flag.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/time.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 84c86543501a..65dbe991426d 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -727,7 +727,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re | |||
727 | static struct irqaction h3800_irq = { | 727 | static struct irqaction h3800_irq = { |
728 | .name = "h3800_asic", | 728 | .name = "h3800_asic", |
729 | .handler = h3800_IRQ_demux, | 729 | .handler = h3800_IRQ_demux, |
730 | .flags = SA_INTERRUPT, | 730 | .flags = SA_INTERRUPT | SA_TIMER, |
731 | }; | 731 | }; |
732 | 732 | ||
733 | u32 kpio_int_shadow = 0; | 733 | u32 kpio_int_shadow = 0; |
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 19b0c0fd6377..0eeb3616ffea 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -99,8 +99,8 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
99 | 99 | ||
100 | static struct irqaction sa1100_timer_irq = { | 100 | static struct irqaction sa1100_timer_irq = { |
101 | .name = "SA11xx Timer Tick", | 101 | .name = "SA11xx Timer Tick", |
102 | .flags = SA_INTERRUPT, | 102 | .flags = SA_INTERRUPT | SA_TIMER, |
103 | .handler = sa1100_timer_interrupt | 103 | .handler = sa1100_timer_interrupt, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static void __init sa1100_timer_init(void) | 106 | static void __init sa1100_timer_init(void) |