diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /arch/arm/mach-pxa/time.c | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 473fb6173f72..6e5202154f91 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
| @@ -105,8 +105,8 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 105 | 105 | ||
| 106 | static struct irqaction pxa_timer_irq = { | 106 | static struct irqaction pxa_timer_irq = { |
| 107 | .name = "PXA Timer Tick", | 107 | .name = "PXA Timer Tick", |
| 108 | .flags = SA_INTERRUPT, | 108 | .flags = SA_INTERRUPT | SA_TIMER, |
| 109 | .handler = pxa_timer_interrupt | 109 | .handler = pxa_timer_interrupt, |
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | static void __init pxa_timer_init(void) | 112 | static void __init pxa_timer_init(void) |