2 files changed, 4 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 3b36a1d53656..a7697787946a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -389,9 +389,6 @@ config SLOB
         default !SLAB
         bool
 
-config OBSOLETE_INTERMODULE
-        tristate
-
 menu "Loadable module support"
 
 config MODULES
diff --git a/init/do_mounts.c b/init/do_mounts.c
index f4b7b9d278cd..21b3b8f33a72 100644
--- 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;