diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch/arm/mach-h720x/cpu-h7202.c | |
parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7202.c')
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 21b8fb6122c..593b6a2a30e 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c @@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = { static struct irqaction h7202_timer_irq = { .name = "h7202 Timer Tick", - .flags = SA_INTERRUPT, - .handler = h7202_timer_interrupt + .flags = SA_INTERRUPT | SA_TIMER, + .handler = h7202_timer_interrupt, }; /* |