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-footbridge/dc21285-timer.c | |
| parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
| parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) | |
| download | kernel-crypto-41b6c37326cb24efc86fba94bcaa37f2cc23f1cd.tar.gz kernel-crypto-41b6c37326cb24efc86fba94bcaa37f2cc23f1cd.tar.xz kernel-crypto-41b6c37326cb24efc86fba94bcaa37f2cc23f1cd.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-footbridge/dc21285-timer.c')
| -rw-r--r-- | arch/arm/mach-footbridge/dc21285-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index da5b9b7623c..14a62d6008f 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c @@ -43,7 +43,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs) static struct irqaction footbridge_timer_irq = { .name = "Timer1 timer tick", .handler = timer1_interrupt, - .flags = SA_INTERRUPT, + .flags = SA_INTERRUPT | SA_TIMER, }; /* |