diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:45:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:45:12 +1000 |
| commit | 11c04206578c83651c72f3703b0015e5bfa4ec84 (patch) | |
| tree | f5225ee8fddf1107f11c3e73b13ff357d8e92d2f /init | |
| parent | d37d31cbe04dd4a20c77fe78c2638ca17838d91a (diff) | |
| parent | f0b3023f22562d7193845f93a4959b4293b43986 (diff) | |
Merge commit 'ubifs/for_andrew'
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 660c1e50c91b..a1de1bf3d6b9 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -372,7 +372,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; } |