[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/mobilepro setup.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4111/mobilepro

Modified Files:
	setup.c 
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	11 Mar 2002 19:36:43 -0000	1.2
+++ setup.c	12 Jul 2002 20:14:28 -0000	1.3
@@ -29,8 +29,6 @@
 extern void vr41xx_restart(char *c);
 extern void vr4111_hibernate(void);
 extern void vr4111_wait(void);
-extern void vr4111_time_init(void);
-extern void vr4111_timer_setup(struct irqaction *irq);
 extern void vr4111_init_serial(void);
 
 void __init bus_error_init(void)
@@ -42,8 +40,8 @@
 	set_io_port_base(VR41XX_PORT_BASE);
 	isa_slot_offset = VR41XX_ISAMEM_BASE;
 
-	board_time_init = vr4111_time_init;
-	board_timer_setup = vr4111_timer_setup;
+	board_time_init = vr41xx_time_init;
+	board_timer_setup = vr41xx_timer_setup;
 
 	_machine_restart = vr41xx_restart;
 	_machine_halt = vr4111_hibernate;