[Linux-mips-commits]CVS: linux/arch/mips/kernel pci_auto.c,1.4,1.5 setup.c,1.50,1.51

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

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

Modified Files:
	pci_auto.c setup.c 
Log Message:
Imported Yoichi-san's Vr41xx patch, with some minor modifications.



Index: pci_auto.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci_auto.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci_auto.c	27 Nov 2001 00:29:25 -0000	1.4
+++ pci_auto.c	7 Mar 2002 03:16:53 -0000	1.5
@@ -256,6 +256,9 @@
 {
 	u32 temp;
 
+	pciauto_lower_memspc += 1;
+	pciauto_lower_iospc += 1;
+
 	/* Configure bus number registers */
 	early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
 				PCI_SUBORDINATE_BUS, sub_bus);

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- setup.c	12 Feb 2002 18:14:18 -0000	1.50
+++ setup.c	7 Mar 2002 03:16:53 -0000	1.51
@@ -713,7 +713,6 @@
 	void momenco_ocelot_setup(void);
 	void nino_setup(void);
 	void nec_osprey_setup(void);
-	void nec_eagle_setup(void);
 	void nec_korva_setup(void);
 	void ps2_setup(void);
 	void clio_1000_setup(void);
@@ -725,6 +724,7 @@
 	void hp_setup(void);
 	void idt_setup(void);
 	void casio_be300_setup(void);	
+	void nec_vr41xx_setup(void);
 
 	unsigned long bootmap_size;
 	unsigned long start_pfn, max_pfn, max_low_pfn, first_usable_pfn;
@@ -816,11 +816,6 @@
 		nec_osprey_setup();
 		break;
 #endif
-#ifdef CONFIG_NEC_EAGLE
-	case MACH_GROUP_NEC_VR41XX:
-		nec_eagle_setup();
-		break;
-#endif
 #ifdef CONFIG_NEC_KORVA
 	case MACH_GROUP_NEC_VR41XX:
 		nec_korva_setup();
@@ -844,6 +839,11 @@
 #ifdef CONFIG_CASIO_BE300
 	case MACH_GROUP_NEC_VR41XX:
 		casio_be300_setup();
+		break;
+#endif
+#ifdef CONFIG_CPU_VR41XX
+	case MACH_GROUP_NEC_VR41XX:
+		nec_vr41xx_setup();
 		break;
 #endif
 #ifdef CONFIG_MIPS_EV96100