--- zzzz-none-000/linux-2.4.17/arch/mips/sni/setup.c	2001-09-09 17:43:02.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/arch/mips/sni/setup.c	2004-11-24 13:22:38.000000000 +0000
@@ -30,6 +30,7 @@
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/sni.h>
+#include <asm/time.h>
 
 extern void sni_machine_restart(char *command);
 extern void sni_machine_halt(void);
@@ -39,8 +40,6 @@
 extern struct rtc_ops std_rtc_ops;
 extern struct kbd_ops std_kbd_ops;
 
-void (*board_time_init)(struct irqaction *irq);
-
 static void __init sni_rm200_pci_time_init(struct irqaction *irq)
 {
 	/* set the clock to 100 Hz */
@@ -50,7 +49,6 @@
 	setup_irq(0, irq);
 }
 
-unsigned char aux_device_present;
 extern unsigned char sni_map_isa_cache;
 
 /*
@@ -80,7 +78,7 @@
 	sni_pcimt_detect();
 	sni_pcimt_sc_init();
 
-	mips_io_port_base = SNI_PORT_BASE;
+	set_io_port_base(SNI_PORT_BASE);
 
 	/*
 	 * Setup (E)ISA I/O memory access stuff