fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.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 7436568..13f76bd 100644 (file)
--- a/arch/arm/mach-h720x/cpu-h7201.c
+++ b/arch/arm/mach-h720x/cpu-h7201.c
@@ -27,12 +27,12 @@
  * Timer interrupt handler
  */
 static irqreturn_t
-h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+h7201_timer_interrupt(int irq, void *dev_id)
 {
        write_seqlock(&xtime_lock);
 
        CPU_REG (TIMER_VIRT, TIMER_TOPSTAT);
-       timer_tick(regs);
+       timer_tick();
 
        write_sequnlock(&xtime_lock);
 
@@ -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,
 };
 
 /*