linux-mips-commits

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

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

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



Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad/init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- init.c	8 Mar 2002 18:55:45 -0000	1.2
+++ init.c	12 Jul 2002 20:14:28 -0000	1.3
@@ -1,6 +1,6 @@
 /*
  * FILE NAME
- *	arch/mips/vr41xx/workpad/init.c
+ *	arch/mips/vr41xx/vr4121/workpad/init.c
  *
  * BRIEF MODULE DESCRIPTION
  *	Initialisation code for the IBM WorkPad z50.
@@ -73,6 +73,7 @@
 		break;
 	default:
 		panic("Memory size error");
+		break;
 	}
 }
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	7 Mar 2002 03:16:54 -0000	1.1
+++ setup.c	12 Jul 2002 20:14:28 -0000	1.2
@@ -1,6 +1,6 @@
 /*
  * FILE NAME
- *	arch/mips/vr41xx/workpad/setup.c
+ *	arch/mips/vr41xx/vr4121/workpad/setup.c
  *
  * BRIEF MODULE DESCRIPTION
  *	Setup for the IBM WorkPad z50.
@@ -63,5 +63,7 @@
 
 	vr41xx_bcu_init();
 
-	vr41xx_siu_init(0, SIU_RS232C, 0);
+	vr41xx_cmu_init(0);
+
+	vr41xx_siu_init(SIU_RS232C, 0);
 }