Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[sfrench/cifs-2.6.git] / arch / mips / gt64120 / ev64120 / setup.c

diff --git a/arch/mips/gt64120/ev64120/setup.c b/arch/mips/gt64120/ev64120/setup.c
index 4236da31ecc679abafd9af5e4c50f55d163ffe79..99c8d42212e2c7973e3e8dc99388ff7fa1bd3594 100644 (file)
--- a/arch/mips/gt64120/ev64120/setup.c
+++ b/arch/mips/gt64120/ev64120/setup.c
@@ -42,7 +42,6 @@
 #include <asm/irq.h>
 #include <asm/pci.h>
 #include <asm/processor.h>
-#include <asm/ptrace.h>
 #include <asm/time.h>
 #include <asm/reboot.h>
 #include <asm/traps.h>
@@ -69,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)
 {
@@ -77,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);
 }