Update of /cvsroot/linuxconsole/ruby/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/mips/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.22
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 15 Mar 2002 19:02:33 -0000 1.1
+++ setup.c 18 Jun 2002 18:51:54 -0000 1.2
@@ -29,6 +29,7 @@
#include <linux/blk.h>
#include <linux/ide.h>
#include <linux/timex.h>
+#include <linux/root_dev.h>
#include <asm/asm.h>
#include <asm/bootinfo.h>
@@ -723,7 +724,7 @@
#ifdef CONFIG_BLK_DEV_INITRD
/* Board specific code should have set up initrd_start and initrd_end */
- ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+ ROOT_DEV = Root_RAM0;
if( __rd_start != __rd_end ) {
initrd_start = (unsigned long)&__rd_start;
initrd_end = (unsigned long)&__rd_end;
|
