--- linux-2.5.2-pre7/init/do_mounts.c	Thu Jan  3 19:52:02 2002
+++ linux/init/do_mounts.c	Fri Jan  4 00:07:50 2002
@@ -631,7 +631,7 @@
 #ifdef CONFIG_BLK_DEV_RAM
 	if (rd_prompt)
 		change_floppy("root floppy disk to be loaded into RAM disk");
-	create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n), NULL);
+	create_dev("/dev/ram", mk_kdev(RAMDISK_MAJOR, n), NULL);
 #endif
 	return rd_load_image("/dev/root");
 }
@@ -724,7 +724,7 @@
 	mount_block_root("/dev/root", root_mountflags);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
+#if defined(CONFIG_BLK_DEV_INITRD) && defined(CONFIG_LINUXRC)
 static int do_linuxrc(void * shell)
 {
 	static char *argv[] = { "linuxrc", NULL, };
@@ -748,7 +748,7 @@
 
 static void __init handle_initrd(void)
 {
-#ifdef CONFIG_BLK_DEV_INITRD
+#if defined(CONFIG_BLK_DEV_INITRD) && defined(CONFIG_LINUXRC)
 	int ram0 = kdev_t_to_nr(MKDEV(RAMDISK_MAJOR,0));
 	int error;
 	int i, pid;
@@ -801,8 +801,8 @@
 static int __init initrd_load(void)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-	create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, 0), NULL);
-	create_dev("/dev/initrd", MKDEV(RAMDISK_MAJOR, INITRD_MINOR), NULL);
+	create_dev("/dev/ram", mk_kdev(RAMDISK_MAJOR, 0), NULL);
+	create_dev("/dev/initrd", mk_kdev(RAMDISK_MAJOR, INITRD_MINOR), NULL);
 #endif
 	return rd_load_image("/dev/initrd");
 }
@@ -816,7 +816,9 @@
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (!initrd_start)
 		mount_initrd = 0;
+# ifdef CONFIG_LINUXRC
 	real_root_dev = ROOT_DEV;
+# endif
 #endif
 	sys_mkdir("/dev", 0700);
 	sys_mkdir("/root", 0700);