[Linuxconsole-commit]CVS: ruby/linux/arch/sh/kernel setup.c,1.7,1.8

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/sh/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/sh/kernel

Modified Files:
	setup.c 
Log Message:
Synced to 2.5.22

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/sh/kernel/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setup.c	13 Mar 2002 23:48:37 -0000	1.7
+++ setup.c	18 Jun 2002 18:51:54 -0000	1.8
@@ -31,6 +31,7 @@
 #include <linux/bootmem.h>
 #include <linux/ctype.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -273,7 +274,7 @@
 	sh_console_init();
 #endif
 	
-	ROOT_DEV = to_kdev_t(ORIG_ROOT_DEV);
+	ROOT_DEV = ORIG_ROOT_DEV;
 
 #ifdef CONFIG_BLK_DEV_RAM
 	rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;