diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
| commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
| tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch/arm/mach-sa1100/time.c | |
| parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
| parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100/time.c')
| -rw-r--r-- | arch/arm/mach-sa1100/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |