diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
| commit | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (patch) | |
| tree | 91e06602f4d3abb6812ea8c9bc9ba4501e14c84e /arch/arm/mach-lh7a40x/time.c | |
| parent | 0274aa2506fd2fe89a58dd6cd64d3b3f7b976af8 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/mach-lh7a40x/time.c')
| -rw-r--r-- | arch/arm/mach-lh7a40x/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c index 51e1c814b400..be377e331f25 100644 --- a/arch/arm/mach-lh7a40x/time.c +++ b/arch/arm/mach-lh7a40x/time.c | |||
| @@ -53,8 +53,8 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 53 | 53 | ||
| 54 | static struct irqaction lh7a40x_timer_irq = { | 54 | static struct irqaction lh7a40x_timer_irq = { |
| 55 | .name = "LHA740x Timer Tick", | 55 | .name = "LHA740x Timer Tick", |
| 56 | .flags = SA_INTERRUPT, | 56 | .flags = SA_INTERRUPT | SA_TIMER, |
| 57 | .handler = lh7a40x_timer_interrupt | 57 | .handler = lh7a40x_timer_interrupt, |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static void __init lh7a40x_timer_init(void) | 60 | static void __init lh7a40x_timer_init(void) |