Merge git://git.infradead.org/hdrinstall-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-h720x / cpu-h7202.c

diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index a4a7c0125d030ea3e5482a4f716d05d08f4f5700..da678d163fd992487ba97ef48a1c6bb3247ac4dd 100644 (file)
--- 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,
 };