From d966f7389c43ec6a9f3c6aeaac8e6c0f365a34af Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 6 Nov 2006 18:17:35 +0000
Subject: [PATCH] --- yaml --- r: 40782 b: refs/heads/master c:
 73f4388aedade209650ed629ab767d3e2b636f7b h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/mips/gt64120/common/time.c          | 2 +-
 trunk/arch/mips/gt64120/ev64120/setup.c        | 2 --
 trunk/arch/mips/gt64120/momenco_ocelot/setup.c | 3 ---
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6ff51a9d55c2..f11fd777498b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e5852f31a22094a19bbc305e42651b6c92f3008
+refs/heads/master: 73f4388aedade209650ed629ab767d3e2b636f7b
diff --git a/trunk/arch/mips/gt64120/common/time.c b/trunk/arch/mips/gt64120/common/time.c
index e6e48323e758..c47eeb768192 100644
--- a/trunk/arch/mips/gt64120/common/time.c
+++ b/trunk/arch/mips/gt64120/common/time.c
@@ -64,7 +64,7 @@ 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;
 
diff --git a/trunk/arch/mips/gt64120/ev64120/setup.c b/trunk/arch/mips/gt64120/ev64120/setup.c
index 91c2d3f41617..99c8d42212e2 100644
--- a/trunk/arch/mips/gt64120/ev64120/setup.c
+++ b/trunk/arch/mips/gt64120/ev64120/setup.c
@@ -68,7 +68,6 @@ unsigned long __init prom_free_prom_memory(void)
  * Initializes basic routines and structures pointers, memory size (as
  * given by the bios and saves the command line.
  */
-extern void gt64120_time_init(void);
 
 void __init plat_mem_setup(void)
 {
@@ -76,7 +75,6 @@ void __init plat_mem_setup(void)
 	_machine_halt = galileo_machine_halt;
 	pm_power_off = galileo_machine_power_off;
 
-	board_time_init = gt64120_time_init;
 	set_io_port_base(KSEG1);
 }
 
diff --git a/trunk/arch/mips/gt64120/momenco_ocelot/setup.c b/trunk/arch/mips/gt64120/momenco_ocelot/setup.c
index 0e5bbee2d5b7..94f94ebbda6c 100644
--- a/trunk/arch/mips/gt64120/momenco_ocelot/setup.c
+++ b/trunk/arch/mips/gt64120/momenco_ocelot/setup.c
@@ -70,7 +70,6 @@ extern void momenco_ocelot_restart(char *command);
 extern void momenco_ocelot_halt(void);
 extern void momenco_ocelot_power_off(void);
 
-extern void gt64120_time_init(void);
 extern void momenco_ocelot_irq_setup(void);
 
 static char reset_reason;
@@ -156,8 +155,6 @@ void __init plat_mem_setup(void)
 	void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache);
 	unsigned int tmpword;
 
-	board_time_init = gt64120_time_init;
-
 	_machine_restart = momenco_ocelot_restart;
 	_machine_halt = momenco_ocelot_halt;
 	pm_power_off = momenco_ocelot_power_off;