Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / arch / arm / mach-h720x / cpu-h7201.c

diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c
index 743656881ed6f8a9baca6ede567ff3112abfe162..a9a8255a3a0397deaf698d46e5f4587ea0931db8 100644 (file)
--- a/arch/arm/mach-h720x/cpu-h7201.c
+++ b/arch/arm/mach-h720x/cpu-h7201.c
@@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction h7201_timer_irq = {
        .name           = "h7201 Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = h7201_timer_interrupt
+       .flags          = IRQF_DISABLED | IRQF_TIMER,
+       .handler        = h7201_timer_interrupt,
 };
 
 /*