[Linuxconsole-commit]CVS: ruby/linux/arch/arm/kernel setup.c,1.13,1.14

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

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

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

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/arm/kernel/setup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- setup.c	4 Jun 2002 19:45:04 -0000	1.13
+++ setup.c	18 Jun 2002 18:51:54 -0000	1.14
@@ -18,6 +18,7 @@
 #include <linux/seq_file.h>
 #include <linux/tty.h>
 #include <linux/init.h>
+#include <linux/root_dev.h>
 
 #include <asm/elf.h>
 #include <asm/hardware.h>
@@ -436,7 +437,7 @@
 	if (tag->hdr.size > 2) {
 		if ((tag->u.core.flags & 1) == 0)
 			root_mountflags &= ~MS_RDONLY;
-		ROOT_DEV = to_kdev_t(tag->u.core.rootdev);
+		ROOT_DEV = tag->u.core.rootdev;
 	}
 	return 0;
 }