Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / arch / mips / gt64120 / common / time.c

diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c
index efafabdd5bbffd8cb60f150c2101509da1a1c055..c47eeb768192394ba3dc1205deb1fea3fd97f0c8 100644 (file)
--- a/arch/mips/gt64120/common/time.c
+++ b/arch/mips/gt64120/common/time.c
@@ -11,7 +11,6 @@
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
 #include <asm/irq_regs.h>
-#include <asm/ptrace.h>
 #include <asm/gt64120.h>
 
 /*
@@ -65,14 +64,14 @@ static irqreturn_t gt64120_irq(int irq, void *dev_id)
  * as *irq (=irq0 in ../kernel/time.c).  We will do our own timer interrupt
  * handling.
  */
-void gt64120_time_init(void)
+void __init plat_timer_setup(struct irqaction *irq)
 {
        static struct irqaction timer;
 
        /* Disable timer first */
        GT_WRITE(GT_TC_CONTROL_OFS, 0);
        /* Load timer value for 100 Hz */
-       GT_WRITE(GT_TC3_OFS, Sys_clock / 100);
+       GT_WRITE(GT_TC3_OFS, Sys_clock / HZ);
 
        /*
         * Create the IRQ structure entry for the timer.  Since we're too early