X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=init%2Fdo_mounts.c;h=f769fac4f4c0de2c1904de7dd3e2e152e196a33a;hb=909d145f0decbc4f17955e1fc4122a669a51fbc0;hp=660c1e50c91b7a622b2e65bf1095cd4e982b58af;hpb=fcff474ea5cb17ff015aa40e92ed86fede41f1e2;p=linux-2.6-omap-h63xx.git

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 660c1e50c91..f769fac4f4c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/initrd.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -372,7 +373,8 @@ void __init prepare_namespace(void)
 
 	if (saved_root_name[0]) {
 		root_device_name = saved_root_name;
-		if (!strncmp(root_device_name, "mtd", 3)) {
+		if (!strncmp(root_device_name, "mtd", 3) ||
+		    !strncmp(root_device_name, "ubi", 3)) {
 			mount_block_root(root_device_name, root_mountflags);
 			goto out;
 		}