diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-03 02:20:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 17:29:22 -0700 |
| commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
| tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-netx | |
| parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) | |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-netx')
| -rw-r--r-- | arch/arm/mach-netx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index edfbdf40c600..6d72c81b7d9f 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c @@ -54,7 +54,7 @@ netx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) static struct irqaction netx_timer_irq = { .name = "NetX Timer Tick", - .flags = SA_INTERRUPT | SA_TIMER, + .flags = IRQF_DISABLED | IRQF_TIMER, .handler = netx_timer_interrupt, }; |