diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 3 | ||||
-rw-r--r-- | init/do_mounts.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index c4d0fa655d5..df864a35822 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -390,9 +390,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 f4b7b9d278c..21b3b8f33a7 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; |