diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-omap1/fpga.c | |
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-omap1/fpga.c')
-rw-r--r-- | arch/arm/mach-omap1/fpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 880cd2d8f4aa..34eb79ee6e61 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -133,7 +133,7 @@ static struct irqchip omap_fpga_irq = { | |||
133 | * mask_ack routine for all of the FPGA interrupts has been changed from | 133 | * mask_ack routine for all of the FPGA interrupts has been changed from |
134 | * fpga_mask_ack_irq() to fpga_ack_irq() so that the specific FPGA interrupt | 134 | * fpga_mask_ack_irq() to fpga_ack_irq() so that the specific FPGA interrupt |
135 | * being serviced is left unmasked. We can do this because the FPGA cascade | 135 | * being serviced is left unmasked. We can do this because the FPGA cascade |
136 | * interrupt is installed with the SA_INTERRUPT flag, which leaves all | 136 | * interrupt is installed with the IRQF_DISABLED flag, which leaves all |
137 | * interrupts masked at the CPU while an FPGA interrupt handler executes. | 137 | * interrupts masked at the CPU while an FPGA interrupt handler executes. |
138 | * | 138 | * |
139 | * Limited testing indicates that this workaround appears to be effective | 139 | * Limited testing indicates that this workaround appears to be effective |