diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-03 00:20:05 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 00:29:22 (GMT) |
| commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
| tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-omap2/timer-gp.c | |
| parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) | |
| download | linux-fsl-qoriq-52e405eaa9806968e88b35d65e57acad954a5ab5.tar.xz | |
[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-omap2/timer-gp.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index cf78e6c..fe5fd6d 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -52,7 +52,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id, static struct irqaction omap2_gp_timer_irq = { .name = "gp timer", - .flags = SA_INTERRUPT | SA_TIMER, + .flags = IRQF_DISABLED | IRQF_TIMER, .handler = omap2_gp_timer_interrupt, }; |