summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-h720x/cpu-h7202.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-03 02:20:05 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 17:29:22 -0700
commit52e405eaa9806968e88b35d65e57acad954a5ab5 (patch)
treeb42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-h720x/cpu-h7202.c
parentd061daa0e3abdddc28e21a37c8ac4536dedbf239 (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-h720x/cpu-h7202.c')
-rw-r--r--arch/arm/mach-h720x/cpu-h7202.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index a4a7c0125d0..da678d163fd 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -171,7 +171,7 @@ static struct irqchip h7202_timerx_chip = {
static struct irqaction h7202_timer_irq = {
.name = "h7202 Timer Tick",
- .flags = SA_INTERRUPT | SA_TIMER,
+ .flags = IRQF_DISABLED | IRQF_TIMER,
.handler = h7202_timer_interrupt,
};