Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[karo-tx-linux.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index f4b7b9d278cd3bf040cdac1a1ee123401549f103..21b3b8f33a728c505cd7396d9e7517775c07706c 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -409,6 +409,10 @@ void __init prepare_namespace(void)
 
        if (saved_root_name[0]) {
                root_device_name = saved_root_name;
+               if (!strncmp(root_device_name, "mtd", 3)) {
+                       mount_block_root(root_device_name, root_mountflags);
+                       goto out;
+               }
                ROOT_DEV = name_to_dev_t(root_device_name);
                if (strncmp(root_device_name, "/dev/", 5) == 0)
                        root_device_name += 5;