patch-2.4.25 linux-2.4.25/arch/mips/kernel/setup.c

Next file: linux-2.4.25/arch/mips/kernel/smp.c
Previous file: linux-2.4.25/arch/mips/kernel/semaphore.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/arch/mips/kernel/setup.c linux-2.4.25/arch/mips/kernel/setup.c
@@ -394,7 +394,7 @@
 		if (PHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) {
 			printk("initrd extends beyond end of memory "
 			       "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-			       PHYSADDR(initrd_end),
+			       (unsigned long) PHYSADDR(initrd_end),
 			       PFN_PHYS(max_low_pfn));
 			initrd_start = initrd_end = 0;
 		}
@@ -479,6 +479,7 @@
 	void momenco_ocelot_setup(void);
 	void momenco_ocelot_g_setup(void);
 	void momenco_ocelot_c_setup(void);
+	void momenco_jaguar_atx_setup(void);
 	void nino_setup(void);
 	void nec_osprey_setup(void);
 	void nec_eagle_setup(void);
@@ -553,6 +554,11 @@
 		momenco_ocelot_c_setup();
 		break;
 #endif
+#ifdef CONFIG_MOMENCO_JAGUAR_ATX
+	case MACH_GROUP_MOMENCO:
+		momenco_jaguar_atx_setup();
+		break;
+#endif
 #ifdef CONFIG_MIPS_SEAD
 	case MACH_GROUP_UNKNOWN:
 		sead_setup();
@@ -681,6 +687,11 @@
                 hp_setup();
                 break;
 #endif
+#ifdef  CONFIG_PMC_YOSEMITE
+        case MACH_GROUP_TITAN:
+                pmc_yosemite_setup();
+                break;
+#endif
 	default:
 		panic("Unsupported architecture");
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)