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-imx/time.c | |
| parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
| parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-imx/time.c')
| -rw-r--r-- | arch/arm/mach-imx/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 11f1e56c36bc..ea805bfa5e54 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
| @@ -72,8 +72,8 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 72 | 72 | ||
| 73 | static struct irqaction imx_timer_irq = { | 73 | static struct irqaction imx_timer_irq = { |
| 74 | .name = "i.MX Timer Tick", | 74 | .name = "i.MX Timer Tick", |
| 75 | .flags = SA_INTERRUPT, | 75 | .flags = SA_INTERRUPT | SA_TIMER, |
| 76 | .handler = imx_timer_interrupt | 76 | .handler = imx_timer_interrupt, |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | /* | 79 | /* |