[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.24,1.25

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

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv30742/arch/mips/kernel

Modified Files:
	setup.c 
Log Message:
Merged Vr4111 (Clio-1000) patch from Jim Paris.



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- setup.c	2001/10/26 16:58:29	1.24
+++ setup.c	2001/10/28 23:04:19	1.25
@@ -599,6 +599,7 @@
 	void nec_eagle_setup(void);
 	void nec_korva_setup(void);
 	void ps2_setup(void);
+	void clio_1000_setup(void);
 
 	unsigned long bootmap_size;
 	unsigned long start_pfn, max_pfn, first_usable_pfn;
@@ -698,6 +699,11 @@
 #ifdef CONFIG_NEC_KORVA
 	case MACH_GROUP_NEC_VR41XX:
 		nec_korva_setup();
+		break;
+#endif
+#ifdef CONFIG_VADEM_CLIO_1000
+	case MACH_GROUP_NEC_VR41XX:
+		clio_1000_setup();
 		break;
 #endif
 #ifdef CONFIG_MIPS_EV96100